Fix InstanceId Incompatibility (#4970)

Co-authored-by: Brendan Doyle <[email protected]>

Author: Brendan Doyle

common/scala/src/main/scala/org/apache/openwhisk/core/entity/InstanceId.scala

@@ -103,6 +103,8 @@ object ControllerInstanceId extends DefaultJsonProtocol {
           } else {
             deserializationError("could not read ControllerInstanceId")
           }
+        case Seq(JsString(asString)) =>
+          new ControllerInstanceId(asString)
         case _ =>
           deserializationError("could not read ControllerInstanceId")
       }

tests/src/test/scala/org/apache/openwhisk/core/entity/test/ControllerInstanceIdTests.scala

@@ -46,6 +46,11 @@ class ControllerInstanceIdTests extends FlatSpec with Matchers {
     }
   }
 
+  it should "deserialize legacy ControllerInstanceId format" in {
+    val i = ControllerInstanceId("controller0")
+    ControllerInstanceId.parse(JsObject("asString" -> JsString("controller0")).compactPrint) shouldBe Success(i)
+  }
+
   it should "serialize and deserialize ControllerInstanceId" in {
     val i = ControllerInstanceId("controller0")
     i.serialize shouldBe JsObject("asString" -> JsString(i.asString), "instanceType" -> JsString(i.instanceType)).compactPrint