Merge pull request #757 from cderici/local-refresh-with-resoruces

#757

#### Description

This fixes the regression where we don't accept local refresh (`upgrade-charm`) with resources.

Fixes #756 

#### QA Steps

Added an additional test to catch this in the future:

```
tox -e integration -- tests/integration/test_application.py::test_upgrade_local_charm_resource
```

Author: jujubot

juju/application.py

@@ -637,14 +637,11 @@ async def refresh(
         :param str switch: Crossgrade charm url
 
         """
-        if resources is not None:
-            raise NotImplementedError("resources option is not implemented")
 
         if switch is not None and revision is not None:
             raise ValueError("switch and revision are mutually exclusive")
 
         app_facade = self._facade()
-        resources_facade = client.ResourcesFacade.from_connection(self.connection)
         charms_facade = client.CharmsFacade.from_connection(self.connection)
 
         # 1 - Figure out the destination origin and destination charm_url
@@ -664,6 +661,9 @@ async def refresh(
                                      force_units, path, resources)
             return
 
+        if resources is not None:
+            raise NotImplementedError("resources option is not implemented")
+
         parsed_url = URL.parse(charm_url)
         charm_name = parsed_url.name
 
@@ -731,6 +731,7 @@ async def refresh(
         # Already prepped the charm_resources
         # Now get the existing resources from the ResourcesFacade
         request_data = [client.Entity(self.tag)]
+        resources_facade = client.ResourcesFacade.from_connection(self.connection)
         response = await resources_facade.ListResources(entities=request_data)
         existing_resources = {
             resource.name: resource

tests/integration/test_application.py

@@ -264,6 +264,26 @@ async def test_upgrade_local_charm(event_loop):
         assert app.data['charm-url'] == 'local:focal/ubuntu-0'
 
 
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_upgrade_local_charm_resource(event_loop):
+    async with base.CleanModel() as model:
+        tests_dir = Path(__file__).absolute().parent
+        charm_path = tests_dir / 'file-resource-charm'
+        resources = {"file-res": "test.file"}
+
+        app = await model.deploy(str(charm_path), resources=resources)
+        assert 'file-resource-charm' in model.applications
+        await model.wait_for_idle()
+        assert app.units[0].agent_status == 'idle'
+
+        await app.upgrade_charm(path=charm_path, resources=resources)
+        await model.wait_for_idle()
+        ress = await app.get_resources()
+        assert 'file-res' in ress
+        assert ress['file-res']
+
+
 @base.bootstrapped
 @pytest.mark.asyncio
 @pytest.mark.skip('Update charm')