Remove charm-store origin/source and use CHARM_HUB constant

Author: cderici

juju/application.py

@@ -25,7 +25,7 @@
 from .errors import JujuError, JujuApplicationConfigError
 from .bundle import get_charm_series
 from .placement import parse as parse_placement
-from .origin import Channel
+from .origin import Channel, Source
 
 log = logging.getLogger(__name__)
 
@@ -676,7 +676,7 @@ async def refresh(
         # Make the source-specific changes to the origin/channel/url
         # (and also get the resources necessary to deploy the (destination) charm -- for later)
         if Schema.CHARM_HUB.matches(parsed_url.schema):
-            origin.source = 'charm-hub'
+            origin.source = Source.CHARM_HUB
             if channel:
                 ch = Channel.parse(channel).normalize()
                 origin.risk = ch.risk

juju/bundle.py

@@ -15,7 +15,7 @@
 from .constraints import parse as parse_constraints, parse_storage_constraint, parse_device_constraint
 from .errors import JujuError
 from . import utils, jasyncio
-from .origin import Channel
+from .origin import Channel, Source
 from .url import Schema, URL
 
 log = logging.getLogger(__name__)
@@ -362,7 +362,7 @@ async def _resolve_charms(self):
                 else:
                     architecture = await self.model._resolve_architecture(charm_url)
 
-                origin = client.CharmOrigin(source="charm-hub",
+                origin = client.CharmOrigin(source=Source.CHARM_HUB.value,
                                             architecture=architecture,
                                             risk=risk,
                                             track=track)
@@ -372,7 +372,7 @@ async def _resolve_charms(self):
                 charm_url, charm_origin, _ = await self.model._resolve_charm(charm_url, origin)
                 spec['charm'] = str(charm_url)
             else:
-                charm_origin = client.CharmOrigin(source="charm-hub",
+                charm_origin = client.CharmOrigin(source=Source.CHARM_HUB.value,
                                                   risk=risk,
                                                   track=track)
 
@@ -715,7 +715,7 @@ async def run(self, context):
             arch = self.architecture
             if not arch:
                 arch = await context.model._resolve_architecture(url)
-            origin = client.CharmOrigin(source="charm-hub",
+            origin = client.CharmOrigin(source=Source.CHARM_HUB.value,
                                         architecture=arch,
                                         risk=ch.risk,
                                         track=ch.track)

juju/model.py

@@ -34,7 +34,7 @@
 from .names import is_valid_application
 from .offerendpoints import ParseError as OfferParseError
 from .offerendpoints import parse_local_endpoint, parse_offer_url
-from .origin import Channel
+from .origin import Channel, Source
 from .placement import parse as parse_placement
 from .tag import application as application_tag
 from .url import URL, Schema
@@ -506,7 +506,7 @@ async def resolve(self, url, architecture, app_name=None, channel=None, series=N
         if series:
             base.channel = ch.normalize().compute_base_channel(series=series)
             base.name = 'ubuntu'
-        origin = client.CharmOrigin(source="charm-hub",
+        origin = client.CharmOrigin(source=Source.CHARM_HUB.value,
                                     architecture=architecture,
                                     risk=ch.risk,
                                     track=ch.track,
@@ -1799,7 +1799,7 @@ async def _resolve_charm(self, url, origin):
         #  origin should be set (including the base) before calling this,
         #  though all tests need to run (in earlier versions too) before
         #  committing to make sure there's no regression
-        source = "charm-hub"
+        source = Source.CHARM_HUB.value
 
         resolve_origin = {'source': source, 'architecture': origin.architecture,
                           'track': origin.track, 'risk': origin.risk,

juju/origin.py

@@ -10,7 +10,6 @@ class Source(Enum):
 
     """
     LOCAL = "local"
-    CHARM_STORE = "charm-store"
     CHARM_HUB = "charm-hub"
 
     def __str__(self):