Merge pull request #180 from canonical/IAM-699-update-kratos-version

chore: bump image version

metadata.yaml

@@ -14,7 +14,7 @@ resources:
   oci-image:
     type: oci-image
     description: Kratos oci-image
-    upstream-source: ghcr.io/canonical/kratos:1.0.0
+    upstream-source: ghcr.io/canonical/kratos:1.1.0
 requires:
   pg-database:
     interface: postgresql_client

src/charm.py

@@ -943,7 +943,8 @@ def _on_delete_identity_action(self, event: ActionEvent) -> None:
 
         if email:
             identity = self.kratos.get_identity_from_email(email)
-            if not identity:
+            identity_id = identity.get("id")
+            if not identity_id:
                 event.fail("Couldn't retrieve identity_id from email.")
                 return
 

src/kratos.py

@@ -93,8 +93,10 @@ def list_identities(self) -> List:
 
         # TODO: Consider reading from the stream instead of waiting for output
         cmd_output = json.loads(self._run_cmd(cmd))
+        identities = cmd_output.get("identities")
         logger.info("Successfully fetched all identities")
-        return cmd_output
+
+        return identities
 
     def get_identity_from_email(self, email: str) -> Optional[Dict]:
         """Get an identity using an email.

tests/unit/test_kratos.py

@@ -132,7 +132,10 @@ def test_delete_identity(
 def test_list_identities(
     kratos_api: KratosAPI, kratos_identity_json: Dict, mocked_kratos_process: MagicMock
 ) -> None:
-    mocked_kratos_process.wait_output.return_value = (json.dumps([kratos_identity_json]), None)
+    mocked_kratos_process.wait_output.return_value = (
+        json.dumps(dict(identities=[kratos_identity_json])),
+        None,
+    )
 
     kratos_api.list_identities()
 
@@ -150,7 +153,10 @@ def test_list_identities(
 def test_get_identity_from_email(
     kratos_api: KratosAPI, kratos_identity_json: Dict, mocked_kratos_process: MagicMock
 ) -> None:
-    mocked_kratos_process.wait_output.return_value = (json.dumps([kratos_identity_json]), None)
+    mocked_kratos_process.wait_output.return_value = (
+        json.dumps(dict(identities=[kratos_identity_json])),
+        None,
+    )
 
     identity = kratos_api.get_identity_from_email(kratos_identity_json["traits"]["email"])
 
@@ -169,7 +175,10 @@ def test_get_identity_from_email(
 def test_get_identity_from_email_with_wrong_mail(
     kratos_api: KratosAPI, kratos_identity_json: Dict, mocked_kratos_process: MagicMock
 ) -> None:
-    mocked_kratos_process.wait_output.return_value = (json.dumps([kratos_identity_json]), None)
+    mocked_kratos_process.wait_output.return_value = (
+        json.dumps(dict(identities=[kratos_identity_json])),
+        None,
+    )
 
     identity = kratos_api.get_identity_from_email("mail")