From 61dbc7ef28b73447961ac368e4759835b5a82091 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Mon, 8 Jan 2018 20:15:46 +0100
Subject: [PATCH 1/7] Add some logging to mock server

---
 kubernetes-server-mock/pom.xml                |  7 +++
 .../mock/KubernetesAttributesExtractor.java   | 60 +++++++------------
 .../server/mock/KubernetesCrudDispatcher.java |  5 ++
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/kubernetes-server-mock/pom.xml b/kubernetes-server-mock/pom.xml
index ce17236b2df..01ded81d7da 100644
--- a/kubernetes-server-mock/pom.xml
+++ b/kubernetes-server-mock/pom.xml
@@ -52,6 +52,13 @@
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index d521637fb38..462b97bf5dd 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -28,8 +28,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class KubernetesAttributesExtractor implements AttributeExtractor<HasMetadata> {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(KubernetesAttributesExtractor.class);
+
   public static final String KIND = "kind";
   public static final String NAME = "name";
   public static final String NAMESPACE = "namespace";
@@ -45,6 +50,8 @@ public class KubernetesAttributesExtractor implements AttributeExtractor<HasMeta
   protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile("/api[s]?/" + VERSION_GROUP + "/namespaces/" + NAMESPACE_GROUP + "/" + KIND_GROUP + "[^ ]*");
   protected static final Pattern NON_NAMESPACED_CREATE_PATH = Pattern.compile("/api[s]?/" + "/" + KIND_GROUP + "[^ ]*");
 
+  protected static final Pattern[] PATTERNS = { NAMESPACED_NAMED_PATH, NON_NAMESPACED_NAMED_PATH, NAMESPACED_CREATE_PATH, NON_NAMESPACED_CREATE_PATH };
+
   @Override
   public AttributeSet fromPath(String s) {
     if (s == null || s.isEmpty()) {
@@ -52,25 +59,13 @@ public AttributeSet fromPath(String s) {
     }
 
     //Get paths
-    Matcher m = NAMESPACED_NAMED_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
-    }
-
-    m = NON_NAMESPACED_NAMED_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
-    }
-
-    //Create paths
-    m = NAMESPACED_CREATE_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
-    }
-
-    m = NON_NAMESPACED_CREATE_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
+    for (Pattern pattern : PATTERNS) {
+      Matcher m = pattern.matcher(s);
+      if (m.matches()) {
+        AttributeSet set = extract(m);
+        LOGGER.debug("fromPath {} : {}", s, set);
+        return set;
+      }
     }
     return new AttributeSet();
   }
@@ -102,26 +97,15 @@ public AttributeSet extract(String s) {
     }
 
     //Get paths
-    Matcher m = NAMESPACED_NAMED_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
-    }
-
-    m = NON_NAMESPACED_NAMED_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
-    }
-
-    //Create paths
-    m = NAMESPACED_CREATE_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
-    }
-
-    m = NON_NAMESPACED_CREATE_PATH.matcher(s);
-    if (m.matches()) {
-      return extract(m);
+    for (Pattern pattern : PATTERNS) {
+      Matcher m = pattern.matcher(s);
+      if (m.matches()) {
+        AttributeSet set = extract(m);
+        LOGGER.debug("extract {} : {}", s, set);
+        return set;
+      }
     }
+    LOGGER.debug("extract {} : no attributes", s);
     return new AttributeSet();
   }
 
diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java
index 22ba0d46857..b31991d3b1a 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java
@@ -27,8 +27,12 @@
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class KubernetesCrudDispatcher extends CrudDispatcher {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(KubernetesCrudDispatcher.class);
 
   public KubernetesCrudDispatcher() {
     this(new KubernetesAttributesExtractor(), new KubernetesResponseComposer());
@@ -52,6 +56,7 @@ public MockResponse handleGet(String path) {
 
     for (Map.Entry<AttributeSet, String> entry : map.entrySet()) {
       if (entry.getKey().matches(query)) {
+        LOGGER.debug("Entry found for query {} : {}", query, entry);
         items.add(entry.getValue());
       }
     }

From 29e2080b2ccf9b470cdb13d7acf353eb4ee52ae3 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Mon, 8 Jan 2018 20:12:25 +0100
Subject: [PATCH 2/7] KubernetesAttributesExtractor is not testing anything

expected.add does not modify object

Parse correctly urls without namespace
---
 .../mock/KubernetesAttributesExtractor.java   |  8 +++----
 .../KubernetesAttributesExtractorTest.java    | 22 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index 462b97bf5dd..fffd8d0da14 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -39,15 +39,15 @@ public class KubernetesAttributesExtractor implements AttributeExtractor<HasMeta
   public static final String NAME = "name";
   public static final String NAMESPACE = "namespace";
 
-  private static final String VERSION_GROUP = "(?<version>[a-zA-z0-9-_\\/]+)";
+  private static final String VERSION_GROUP = "(?<version>[a-zA-z0-9-_]+)";
   private static final String KIND_GROUP = "(?<kind>[^/]+)";
   private static final String NAME_GROUP = "(?<name>[^/]+)";
-  private static final String NAMESPACE_GROUP = "(?<namespace>[^/]+)";
+  private static final String NAMESPACE_GROUP = "(namespaces/(?<namespace>[^/]+)/)?";
 
-  protected static final Pattern NAMESPACED_NAMED_PATH = Pattern.compile("/api[s]?/" + VERSION_GROUP + "/namespaces/" + NAMESPACE_GROUP + "/" + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
+  protected static final Pattern NAMESPACED_NAMED_PATH = Pattern.compile("/api[s]?/" + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
   protected static final Pattern NON_NAMESPACED_NAMED_PATH = Pattern.compile("/api[s]?/" + "/" + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
 
-  protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile("/api[s]?/" + VERSION_GROUP + "/namespaces/" + NAMESPACE_GROUP + "/" + KIND_GROUP + "[^ ]*");
+  protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile("/api[s]?/" + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "[^ ]*");
   protected static final Pattern NON_NAMESPACED_CREATE_PATH = Pattern.compile("/api[s]?/" + "/" + KIND_GROUP + "[^ ]*");
 
   protected static final Pattern[] PATTERNS = { NAMESPACED_NAMED_PATH, NON_NAMESPACED_NAMED_PATH, NAMESPACED_CREATE_PATH, NON_NAMESPACED_CREATE_PATH };
diff --git a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
index c477eec142c..93bae7b50f6 100644
--- a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
+++ b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
@@ -31,10 +31,10 @@ public void shouldHandleNamespacedPath() {
     AttributeSet attributes = extractor.extract("/api/v1/namespaces/myns/pods/mypod");
 
     AttributeSet expected = new AttributeSet();
-    expected.add(new Attribute("kind", "pod"));
-    expected.add(new Attribute("namespace", "myns"));
-    expected.add(new Attribute("name", "mypod"));
-    Assert.assertTrue(attributes.matches(expected));
+    expected = expected.add(new Attribute("kind", "pod"));
+    expected = expected.add(new Attribute("namespace", "myns"));
+    expected = expected.add(new Attribute("name", "mypod"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
   }
 
   @Test
@@ -43,9 +43,9 @@ public void shouldHandleNonNamespacedPath() {
     AttributeSet attributes = extractor.extract("/api/v1/nodes/mynode");
 
     AttributeSet expected = new AttributeSet();
-    expected.add(new Attribute("kind", "node"));
-    expected.add(new Attribute("name", "mynode"));
-    Assert.assertTrue(attributes.matches(expected));
+    expected = expected.add(new Attribute("kind", "node"));
+    expected = expected.add(new Attribute("name", "mynode"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
   }
 
 
@@ -58,10 +58,10 @@ public void shouldHandleResource() {
     AttributeSet attributes = extractor.extract(pod);
 
     AttributeSet expected = new AttributeSet();
-    expected.add(new Attribute("kind", "pod"));
-    expected.add(new Attribute("namespace", "myns"));
-    expected.add(new Attribute("name", "mypod"));
-    Assert.assertTrue(attributes.matches(expected));
+    expected = expected.add(new Attribute("kind", "pod"));
+    expected = expected.add(new Attribute("namespace", "myns"));
+    expected = expected.add(new Attribute("name", "mypod"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
 
   }
 }

From feac0ed67ec1864d5f2e85c8293079d46118f8ef Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Mon, 8 Jan 2018 21:45:26 +0100
Subject: [PATCH 3/7] Parse ingresses correctly

---
 .../mock/KubernetesAttributesExtractor.java      |  4 +++-
 .../mock/KubernetesAttributesExtractorTest.java  | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index fffd8d0da14..47f3c2a22da 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -134,7 +134,9 @@ private static AttributeSet extract(Matcher m) {
       if (!Strings.isNullOrEmpty(kind)) {
 
         //Poor mans to singular.
-        if (kind.endsWith("s")) {
+        if (kind.endsWith("ses")) {
+          kind = kind.substring(0, kind.length() - 2);
+        } else if (kind.endsWith("s")) {
           kind = kind.substring(0, kind.length() - 1);
         }
         attributes = attributes.add(new Attribute(KIND, kind));
diff --git a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
index 93bae7b50f6..d71a0b59729 100644
--- a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
+++ b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
@@ -17,6 +17,8 @@
 
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodBuilder;
+import io.fabric8.kubernetes.api.model.extensions.Ingress;
+import io.fabric8.kubernetes.api.model.extensions.IngressBuilder;
 import io.fabric8.mockwebserver.crud.Attribute;
 import io.fabric8.mockwebserver.crud.AttributeSet;
 import org.junit.Assert;
@@ -64,4 +66,18 @@ public void shouldHandleResource() {
     Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
 
   }
+
+  @Test
+  public void shouldHandleIngress() {
+    KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
+    Ingress ingress = new IngressBuilder().withNewMetadata().withName("myingress").withNamespace("myns").endMetadata().build();
+
+    AttributeSet attributes = extractor.extract(ingress);
+
+    AttributeSet expected = new AttributeSet();
+    expected = expected.add(new Attribute("kind", "ingress"));
+    expected = expected.add(new Attribute("namespace", "myns"));
+    expected = expected.add(new Attribute("name", "myingress"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
+  }
 }

From cce4b6617ffb0eeeb0dbc01cfa4c38a0acb73832 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Mon, 8 Jan 2018 21:59:38 +0100
Subject: [PATCH 4/7] Handle /apis/extensions/* urls

---
 .../server/mock/KubernetesAttributesExtractor.java       | 9 +++++----
 .../server/mock/KubernetesAttributesExtractorTest.java   | 4 +---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index 47f3c2a22da..4dc1442b2e4 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -39,16 +39,17 @@ public class KubernetesAttributesExtractor implements AttributeExtractor<HasMeta
   public static final String NAME = "name";
   public static final String NAMESPACE = "namespace";
 
+  private static final String API_GROUP = "/api[s]?/(extensions/)?";
   private static final String VERSION_GROUP = "(?<version>[a-zA-z0-9-_]+)";
   private static final String KIND_GROUP = "(?<kind>[^/]+)";
   private static final String NAME_GROUP = "(?<name>[^/]+)";
   private static final String NAMESPACE_GROUP = "(namespaces/(?<namespace>[^/]+)/)?";
 
-  protected static final Pattern NAMESPACED_NAMED_PATH = Pattern.compile("/api[s]?/" + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
-  protected static final Pattern NON_NAMESPACED_NAMED_PATH = Pattern.compile("/api[s]?/" + "/" + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
+  protected static final Pattern NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
+  protected static final Pattern NON_NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
 
-  protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile("/api[s]?/" + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "[^ ]*");
-  protected static final Pattern NON_NAMESPACED_CREATE_PATH = Pattern.compile("/api[s]?/" + "/" + KIND_GROUP + "[^ ]*");
+  protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "[^ ]*");
+  protected static final Pattern NON_NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + "[^ ]*");
 
   protected static final Pattern[] PATTERNS = { NAMESPACED_NAMED_PATH, NON_NAMESPACED_NAMED_PATH, NAMESPACED_CREATE_PATH, NON_NAMESPACED_CREATE_PATH };
 
diff --git a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
index d71a0b59729..d232f2ffa34 100644
--- a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
+++ b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
@@ -70,9 +70,7 @@ public void shouldHandleResource() {
   @Test
   public void shouldHandleIngress() {
     KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
-    Ingress ingress = new IngressBuilder().withNewMetadata().withName("myingress").withNamespace("myns").endMetadata().build();
-
-    AttributeSet attributes = extractor.extract(ingress);
+    AttributeSet attributes = extractor.extract("/apis/extensions/v1beta1/namespaces/myns/ingresses/myingress");
 
     AttributeSet expected = new AttributeSet();
     expected = expected.add(new Attribute("kind", "ingress"));

From dccac49ec358eec14a40c57cd25edec4f54e2eac Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Tue, 9 Jan 2018 10:24:21 +0100
Subject: [PATCH 5/7] KubernetesAttributesExtractor, handle ingresses root url

---
 .../server/mock/KubernetesAttributesExtractor.java    |  9 +++++----
 .../mock/KubernetesAttributesExtractorTest.java       | 11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index 4dc1442b2e4..3fc1beda0f8 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -44,12 +44,13 @@ public class KubernetesAttributesExtractor implements AttributeExtractor<HasMeta
   private static final String KIND_GROUP = "(?<kind>[^/]+)";
   private static final String NAME_GROUP = "(?<name>[^/]+)";
   private static final String NAMESPACE_GROUP = "(namespaces/(?<namespace>[^/]+)/)?";
+  private static final String END_GROUP = "[^ /]*";
 
-  protected static final Pattern NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
-  protected static final Pattern NON_NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + "/" + NAME_GROUP + "[^ ]*");
+  protected static final Pattern NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "/" + NAME_GROUP + END_GROUP);
+  protected static final Pattern NON_NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + "/" + NAME_GROUP + END_GROUP);
 
-  protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "[^ ]*");
-  protected static final Pattern NON_NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + "[^ ]*");
+  protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + END_GROUP);
+  protected static final Pattern NON_NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + END_GROUP);
 
   protected static final Pattern[] PATTERNS = { NAMESPACED_NAMED_PATH, NON_NAMESPACED_NAMED_PATH, NAMESPACED_CREATE_PATH, NON_NAMESPACED_CREATE_PATH };
 
diff --git a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
index d232f2ffa34..7e8bde02634 100644
--- a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
+++ b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
@@ -78,4 +78,15 @@ public void shouldHandleIngress() {
     expected = expected.add(new Attribute("name", "myingress"));
     Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
   }
+
+  @Test
+  public void shouldHandleIngresses() {
+    KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
+    AttributeSet attributes = extractor.extract("/apis/extensions/v1beta1/namespaces/myns/ingresses");
+
+    AttributeSet expected = new AttributeSet();
+    expected = expected.add(new Attribute("kind", "ingress"));
+    expected = expected.add(new Attribute("namespace", "myns"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
+  }
 }

From 942c3766401cc80dbcb9cd55f6050c79ac74a633 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Tue, 9 Jan 2018 10:33:25 +0100
Subject: [PATCH 6/7] KubernetesAttributesExtractor, handle path with
 parameters

---
 .../mock/KubernetesAttributesExtractor.java   |  4 ++--
 .../KubernetesAttributesExtractorTest.java    | 21 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index 3fc1beda0f8..239fb4200d9 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -41,8 +41,8 @@ public class KubernetesAttributesExtractor implements AttributeExtractor<HasMeta
 
   private static final String API_GROUP = "/api[s]?/(extensions/)?";
   private static final String VERSION_GROUP = "(?<version>[a-zA-z0-9-_]+)";
-  private static final String KIND_GROUP = "(?<kind>[^/]+)";
-  private static final String NAME_GROUP = "(?<name>[^/]+)";
+  private static final String KIND_GROUP = "(?<kind>[^/?]+)";
+  private static final String NAME_GROUP = "(?<name>[^/?]+)";
   private static final String NAMESPACE_GROUP = "(namespaces/(?<namespace>[^/]+)/)?";
   private static final String END_GROUP = "[^ /]*";
 
diff --git a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
index 7e8bde02634..6815b78cd2b 100644
--- a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
+++ b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
@@ -28,7 +28,7 @@
 public class KubernetesAttributesExtractorTest {
 
   @Test
-  public void shouldHandleNamespacedPath() {
+  public void shouldHandleNamespacedPathWithResource() {
     KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
     AttributeSet attributes = extractor.extract("/api/v1/namespaces/myns/pods/mypod");
 
@@ -39,6 +39,17 @@ public void shouldHandleNamespacedPath() {
     Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
   }
 
+  @Test
+  public void shouldHandleNamespacedPath() {
+    KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
+    AttributeSet attributes = extractor.extract("/api/v1/namespaces/myns/pods");
+
+    AttributeSet expected = new AttributeSet();
+    expected = expected.add(new Attribute("kind", "pod"));
+    expected = expected.add(new Attribute("namespace", "myns"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
+  }
+
   @Test
   public void shouldHandleNonNamespacedPath() {
     KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
@@ -50,7 +61,15 @@ public void shouldHandleNonNamespacedPath() {
     Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
   }
 
+  @Test
+  public void shouldHandlePathWithParameters() {
+    KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
+    AttributeSet attributes = extractor.extract("/api/v1/pods?labelSelector=testKey%3DtestValue");
 
+    AttributeSet expected = new AttributeSet();
+    expected = expected.add(new Attribute("kind", "pod"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
+  }
 
   @Test
   public void shouldHandleResource() {

From 5fd578cee8e617ef484905ae41bb06555cd2fe0b Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Tue, 9 Jan 2018 12:08:52 +0100
Subject: [PATCH 7/7] Simplify regex in KubernetesAttributesExtractor

---
 .../mock/KubernetesAttributesExtractor.java   | 42 +++++++------------
 .../KubernetesAttributesExtractorTest.java    | 22 +++++++++-
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index 239fb4200d9..5b277dc20fe 100644
--- a/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -39,20 +39,14 @@ public class KubernetesAttributesExtractor implements AttributeExtractor<HasMeta
   public static final String NAME = "name";
   public static final String NAMESPACE = "namespace";
 
-  private static final String API_GROUP = "/api[s]?/(extensions/)?";
-  private static final String VERSION_GROUP = "(?<version>[a-zA-z0-9-_]+)";
-  private static final String KIND_GROUP = "(?<kind>[^/?]+)";
-  private static final String NAME_GROUP = "(?<name>[^/?]+)";
-  private static final String NAMESPACE_GROUP = "(namespaces/(?<namespace>[^/]+)/)?";
+  private static final String API_GROUP = "/api[s]?(/extensions)?";
+  private static final String VERSION_GROUP = "(/(?<version>[a-zA-z0-9-_]+))?";
+  private static final String KIND_GROUP = "/(?<kind>[^/?]+)";
+  private static final String NAME_GROUP = "(/(?<name>[^/?]+))?";
+  private static final String NAMESPACE_GROUP = "(/namespaces/(?<namespace>[^/]+))?";
   private static final String END_GROUP = "[^ /]*";
 
-  protected static final Pattern NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + "/" + NAME_GROUP + END_GROUP);
-  protected static final Pattern NON_NAMESPACED_NAMED_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + "/" + NAME_GROUP + END_GROUP);
-
-  protected static final Pattern NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + VERSION_GROUP + "/" + NAMESPACE_GROUP + KIND_GROUP + END_GROUP);
-  protected static final Pattern NON_NAMESPACED_CREATE_PATH = Pattern.compile(API_GROUP + "/" + KIND_GROUP + END_GROUP);
-
-  protected static final Pattern[] PATTERNS = { NAMESPACED_NAMED_PATH, NON_NAMESPACED_NAMED_PATH, NAMESPACED_CREATE_PATH, NON_NAMESPACED_CREATE_PATH };
+  protected static final Pattern PATTERN = Pattern.compile(API_GROUP + VERSION_GROUP + NAMESPACE_GROUP + KIND_GROUP + NAME_GROUP + END_GROUP);
 
   @Override
   public AttributeSet fromPath(String s) {
@@ -61,13 +55,11 @@ public AttributeSet fromPath(String s) {
     }
 
     //Get paths
-    for (Pattern pattern : PATTERNS) {
-      Matcher m = pattern.matcher(s);
-      if (m.matches()) {
-        AttributeSet set = extract(m);
-        LOGGER.debug("fromPath {} : {}", s, set);
-        return set;
-      }
+    Matcher m = PATTERN.matcher(s);
+    if (m.matches()) {
+      AttributeSet set = extract(m);
+      LOGGER.debug("fromPath {} : {}", s, set);
+      return set;
     }
     return new AttributeSet();
   }
@@ -99,13 +91,11 @@ public AttributeSet extract(String s) {
     }
 
     //Get paths
-    for (Pattern pattern : PATTERNS) {
-      Matcher m = pattern.matcher(s);
-      if (m.matches()) {
-        AttributeSet set = extract(m);
-        LOGGER.debug("extract {} : {}", s, set);
-        return set;
-      }
+    Matcher m = PATTERN.matcher(s);
+    if (m.matches()) {
+      AttributeSet set = extract(m);
+      LOGGER.debug("extract {} : {}", s, set);
+      return set;
     }
     LOGGER.debug("extract {} : no attributes", s);
     return new AttributeSet();
diff --git a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
index 6815b78cd2b..3a5a4a25f81 100644
--- a/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
+++ b/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractorTest.java
@@ -17,8 +17,6 @@
 
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodBuilder;
-import io.fabric8.kubernetes.api.model.extensions.Ingress;
-import io.fabric8.kubernetes.api.model.extensions.IngressBuilder;
 import io.fabric8.mockwebserver.crud.Attribute;
 import io.fabric8.mockwebserver.crud.AttributeSet;
 import org.junit.Assert;
@@ -86,6 +84,26 @@ public void shouldHandleResource() {
 
   }
 
+  @Test
+  public void shouldHandleKindWithoutVersion() {
+    KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
+    AttributeSet attributes = extractor.extract("/api/pods");
+
+    AttributeSet expected = new AttributeSet();
+    expected = expected.add(new Attribute("kind", "pod"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
+  }
+
+  @Test
+  public void shouldHandleExtensions() {
+    KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();
+    AttributeSet attributes = extractor.extract("/apis/extensions/v1beta1/deployments");
+
+    AttributeSet expected = new AttributeSet();
+    expected = expected.add(new Attribute("kind", "deployment"));
+    Assert.assertTrue("Expected " + attributes + " to match " + expected, attributes.matches(expected));
+  }
+
   @Test
   public void shouldHandleIngress() {
     KubernetesAttributesExtractor extractor = new KubernetesAttributesExtractor();