Merge pull request #509 from juju/johnsca/metadata-referenced-before-assignment

#509

For the life of me, I can't figure out how this wasn't caught by the test added in #486.

Author: jujubot

juju/application.py

@@ -17,14 +17,13 @@
 import logging
 import os
 
-from . import model, tag
+from . import model, tag, utils
 from .status import derive_status
 from .annotationhelper import _get_annotations, _set_annotations
 from .client import client
 from .errors import JujuError
 from .bundle import get_charm_series
 from .placement import parse as parse_placement
-from .charm import get_local_charm_metadata
 
 log = logging.getLogger(__name__)
 
@@ -718,7 +717,7 @@ async def local_refresh(
             if default_series:
                 series = default_series.value
         charm_url = await self.model.add_local_charm_dir(charm_dir, series)
-        metadata = get_local_charm_metadata(path)
+        metadata = utils.get_local_charm_metadata(path)
         if resources is not None:
             resources = await self.model.add_local_resources(self.entity_id,
                                                              charm_url,

juju/charm.py

@@ -13,31 +13,10 @@
 #     limitations under the License.
 
 import logging
-import zipfile
-import yaml
-from pathlib import Path
 from . import model
 
 log = logging.getLogger(__name__)
 
 
-def get_local_charm_metadata(path):
-    """Retrieve Metadata of a Charm from its path
-
-    :patam str path: Path of charm directory or .charm file
-
-    :return: Object of charm metadata
-    """
-    if str(path).endswith('.charm'):
-        with zipfile.ZipFile(path, 'r') as charm_file:
-            metadata = yaml.load(charm_file.read('metadata.yaml'), Loader=yaml.FullLoader)
-    else:
-        entity_path = Path(path)
-        metadata_path = entity_path / 'metadata.yaml'
-        metadata = yaml.load(metadata_path.read_text(), Loader=yaml.FullLoader)
-
-    return metadata
-
-
 class Charm(model.ModelEntity):
     pass

juju/model.py

@@ -1419,7 +1419,6 @@ async def deploy(
         entity_url = str(entity_url)  # allow for pathlib.Path objects
         entity_path = Path(entity_url.replace('local:', ''))
         bundle_path = entity_path / 'bundle.yaml'
-        metadata_path = entity_path / 'metadata.yaml'
 
         is_local = (
             entity_url.startswith('local:') or
@@ -1470,12 +1469,8 @@ async def deploy(
                                                             entity_id,
                                                             entity=entity)
             else:
+                metadata = utils.get_local_charm_metadata(entity_path)
                 if not application_name:
-                    if str(entity_path).endswith('.charm'):
-                        with zipfile.ZipFile(entity_path, 'r') as charm_file:
-                            metadata = yaml.load(charm_file.read('metadata.yaml'), Loader=yaml.FullLoader)
-                    else:
-                        metadata = yaml.load(metadata_path.read_text(), Loader=yaml.FullLoader)
                     application_name = metadata['name']
                 # We have a local charm dir that needs to be uploaded
                 charm_dir = os.path.abspath(

juju/utils.py

@@ -8,6 +8,7 @@
 from pyasn1.type import univ, char
 from pyasn1.codec.der.encoder import encode
 import yaml
+import zipfile
 
 
 async def execute_process(*cmd, log=None, loop=None):
@@ -185,3 +186,21 @@ def generate_user_controller_access_token(username, controller_endpoints, secret
     remainder = len(registration_string) % 3
     registration_string += b"\0" * (3 - remainder)
     return base64.urlsafe_b64encode(registration_string)
+
+
+def get_local_charm_metadata(path):
+    """Retrieve Metadata of a Charm from its path
+
+    :patam str path: Path of charm directory or .charm file
+
+    :return: Object of charm metadata
+    """
+    if str(path).endswith('.charm'):
+        with zipfile.ZipFile(path, 'r') as charm_file:
+            metadata = yaml.load(charm_file.read('metadata.yaml'), Loader=yaml.FullLoader)
+    else:
+        entity_path = Path(path)
+        metadata_path = entity_path / 'metadata.yaml'
+        metadata = yaml.load(metadata_path.read_text(), Loader=yaml.FullLoader)
+
+    return metadata