feat: set_redirects, remove_redirects, add many redirects, plus their tests

Author: rihp

packages/polywrap-client-config-builder/polywrap_client_config_builder/client_config_builder.py

@@ -179,7 +179,25 @@ def set_uri_redirect(self, uri_from: Uri, uri_to: Uri):
         Sets an uri redirect, from one uri to another
         If there was a redirect previously listed, it's changed to the new one
         """ 
-        self.config.redirects = {uri_from : uri_to}
+        self.config.redirects[uri_from] = uri_to
+        return self
+    
+    def remove_uri_redirect(self, uri_from: Uri):
+        """
+        Removes an uri redirect, from one uri to another
+        """
+        self.config.redirects.pop(uri_from)
+        return self
+
+    def set_uri_redirects(self, redirects: List[Dict[Uri,Uri]]):
+        """
+        Sets various Uri redirects from a list simultaneously
+        """
+        count = 0
+        for redir in redirects:
+            for k,v in redir.items():
+                self.set_uri_redirect(k,v)
+            count += 1
         return self
 
 

packages/polywrap-client-config-builder/tests/conftest.py

@@ -27,8 +27,12 @@ def env_varS():
 
 @fixture
 def env_uriX():
-    return Uri("wrap://ens/eth.plugin.one")
+    return Uri("wrap://ens/eth.plugin.one/X")
 
 @fixture
 def env_uriY():
-    return Uri("wrap://ipfs/filecoin.wrapper.two")
+    return Uri("wrap://ipfs/filecoin.wrapper.two/Y")
+
+@fixture
+def env_uriZ():
+    return Uri("wrap://pinlist/dev.wrappers.io/Z")

packages/polywrap-client-config-builder/tests/test_client_config_builder.py

@@ -187,6 +187,81 @@ def test_client_config_builder_add_resolver():
     resolvers: List[UriResolverLike] = [resolverA, resolverB, resolverC, resolverD]
     assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=resolvers, wrappers=[], packages=[], redirects={}))
 
+# REDIRECTS
+
+def test_client_config_builder_sets_uri_redirects(env_uriX, env_uriY, env_uriZ):
+    # set a first redirect
+    ccb = ClientConfigBuilder()
+    ccb = ccb.set_uri_redirect(env_uriX, env_uriY)
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[],
+        redirects={env_uriX: env_uriY}))
+    
+    # add a second redirect
+    ccb = ccb.set_uri_redirect(env_uriY, env_uriZ)
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[],
+        redirects={env_uriX: env_uriY, env_uriY: env_uriZ}))
+
+    # update the first redirect
+    ccb.set_uri_redirect(env_uriX, env_uriZ)
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[],
+         redirects={env_uriX: env_uriZ, env_uriY: env_uriZ}))
+
+def test_client_config_builder_removes_uri_redirects(env_uriX, env_uriY, env_uriZ):
+    ccb = ClientConfigBuilder()
+    ccb = ccb.set_uri_redirect(env_uriX, env_uriY)
+    ccb = ccb.set_uri_redirect(env_uriY, env_uriZ)
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[],
+        redirects={env_uriX: env_uriY, env_uriY: env_uriZ}))
+    
+    ccb = ccb.remove_uri_redirect(env_uriX)
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[],
+        redirects={env_uriY: env_uriZ}))
+
+
+
+def test_client_config_builder_sets_many_uri_redirects(env_uriX,env_uriY, env_uriZ):
+
+    # set a first redirect
+    ccb = ClientConfigBuilder()
+    ccb = ccb.set_uri_redirects([{
+            env_uriX: env_uriY,
+        }] )
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[], redirects={env_uriX: env_uriY}))
+
+    # updates that first redirect to a new value
+    ccb = ccb.set_uri_redirects([{
+            env_uriX: env_uriZ,
+        }] )
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[], redirects={env_uriX: env_uriZ}))
+
+    # add a second redirect
+    ccb = ccb.set_uri_redirects([{
+            env_uriY: env_uriX,
+        }] )
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[], redirects={env_uriX: env_uriZ, env_uriY: env_uriX}))
+
+    # add a third redirect and update the first redirect
+    ccb = ccb.set_uri_redirects([{
+            env_uriX: env_uriY,
+            env_uriZ: env_uriY,
+        }] )
+    client_config: ClientConfig = ccb.build()
+    assert asdict(client_config) == asdict(ClientConfig(envs={}, interfaces={}, resolver=[], wrappers=[], packages=[],
+        redirects={
+        env_uriX: env_uriY, 
+        env_uriY: env_uriX, 
+        env_uriZ: env_uriY
+        }))
+
+
 # GENERIC ADD FUNCTION
 
 def test_client_config_builder_generic_add(env_varA,env_uriX, env_uriY):