Allow colons in Identity values (#5029)

JesseLovelace · chingor13 · commit fff25ba88535 · 2019-05-22T13:51:31.000-07:00
diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Identity.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Identity.java
@@ -255,7 +255,7 @@ public String strValue() {
    * policy identities to {@code Identity} objects.
    */
   public static Identity valueOf(String identityStr) {
-    String[] info = identityStr.split(":");
+    String[] info = identityStr.split(":", 2);
     Type type = Type.valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, info[0]));
     if (info.length == 1) {
       return new Identity(type, null);
diff --git a/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java b/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java
@@ -141,16 +141,18 @@ public void testValueOfEmpty() {
     Identity.valueOf("");
   }
 
-  @Test(expected = IllegalArgumentException.class)
-  public void testValueOfThreePart() {
-    Identity.valueOf("a:b:c");
-  }
-
   @Test
   public void testUnrecognizedToString() {
     assertEquals("a:b", Identity.valueOf("a:b").strValue());
   }
 
+  @Test
+  public void testValueOfThreePart() {
+    Identity identity = Identity.valueOf("a:b:c");
+    assertEquals("A", identity.getType().name());
+    assertEquals("b:c", identity.getValue());
+  }
+
   private void compareIdentities(Identity expected, Identity actual) {
     assertEquals(expected, actual);
     assertEquals(expected.getType(), actual.getType());
