Fix IPFS CID parsing logic in GraphQL resolvers

Signed-off-by: Filippo Costa <[email protected]>

crates/common_types/src/hex_string.rs

@@ -24,7 +24,7 @@ use serde::{Deserialize, Serialize};
 )]
 // TODO: The fact that we SQL-encode all kinds of hex strings, even fixed-length
 // ones, as variable-length byte sequences is a bit of a wart. Not that big of a
-// deal, but maybe there's a better way to do this.
+// deal though.
 #[diesel(sql_type = sql_types::Binary)]
 pub struct HexString<T>(pub T);
 

crates/common_types/src/ipfs_cid.rs

@@ -30,7 +30,12 @@ pub struct IpfsCid(cid::Cid);
 #[async_graphql::Scalar]
 impl async_graphql::ScalarType for IpfsCid {
     fn parse(value: async_graphql::Value) -> async_graphql::InputValueResult<Self> {
-        Ok(Deserialize::deserialize(value.into_json()?)?)
+        let async_graphql::Value::String(string) = value else {
+            return Err(async_graphql::InputValueError::expected_type(value));
+        };
+
+        let cid = cid::Cid::from_str(&string)?;
+        Ok(IpfsCid(cid))
     }
 
     fn to_value(&self) -> async_graphql::Value {
@@ -62,10 +67,19 @@ impl Arbitrary for IpfsCid {
 
 #[cfg(test)]
 mod tests {
+    use async_graphql::ScalarType;
     use quickcheck_macros::quickcheck;
 
     use super::*;
 
+    #[quickcheck]
+    fn async_graphql_roundtrip(ipfs_cid: IpfsCid) -> bool {
+        let async_graphql_value = ipfs_cid.to_value();
+        let ipfs_cid2: IpfsCid = ScalarType::parse(async_graphql_value).unwrap();
+
+        ipfs_cid == ipfs_cid2
+    }
+
     #[quickcheck]
     fn serde_roundtrip(ipfs_cid: IpfsCid) -> bool {
         let json = serde_json::to_string(&ipfs_cid).unwrap();
@@ -74,8 +88,16 @@ mod tests {
         ipfs_cid == ipfs_cid2
     }
 
+    #[quickcheck]
+    fn from_str_roundtrip_quickcheck(ipfs_cid: IpfsCid) -> bool {
+        let string = ipfs_cid.to_string();
+        let ipfs_cid2 = IpfsCid::from_str(&string).unwrap();
+
+        ipfs_cid == ipfs_cid2
+    }
+
     #[test]
-    fn deployment_id_from_str_roundtrip() {
+    fn from_str_roundtrip() {
         let deployment_id = "QmNY7gDNXHECV8SXoEY7hbfg4BX1aDMxTBDiFuG4huaSGA";
         let ipfs_id = IpfsCid::from_str(deployment_id).unwrap();
 

ops/compose/dependencies.yml

@@ -14,7 +14,7 @@ services:
     environment:
       # Plugins:
       # - https://github.com/fifemon/graphql-datasource for GraphQL data sources.
-      - GF_INSTALL_PLUGINS=fifemon-graphql-datasource
+      - GF_INSTALL_PLUGINS=fifemon-graphql-datasource,yesoreyeram-infinity-datasource
     volumes:
       - ./grafana/config/:/etc/grafana/
       - ./grafana/data:/var/lib/grafana/
@@ -57,7 +57,7 @@ services:
       PGDATA: "/var/lib/postgresql/data"
     command: -p 5433
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}" ]
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
       interval: 1s
       timeout: 1s
       retries: 1000