Skip to content

Add support for .charm files #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jujubot merged 2 commits into from
Feb 4, 2021
Merged

Add support for .charm files #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ce73c2
Add support for .charm files
johnsca Feb 2, 2021
db54074
Merge branch 'master' into johnsca/accept-charm-files
johnsca Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions juju/bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import asyncio
import logging
import os
import zipfile
from pathlib import Path

import yaml
Expand Down Expand Up @@ -179,11 +180,16 @@ def get_charm_series(path):

Returns None if no series can be determined.
"""
md = Path(path) / "metadata.yaml"
if not md.exists():
return None
try:
data = yaml.safe_load(md.open())
if path.endswith('.charm'):
Copy link
Copy Markdown
Member

@SimonRichardson SimonRichardson Feb 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 juju download also uses the .charm extension, so this is perfect.

md = "metadata.yaml in %s" % path
with zipfile.ZipFile(path, 'r') as charm_file:
data = yaml.safe_load(charm_file.read('metadata.yaml'))
else:
md = Path(path) / "metadata.yaml"
if not md.exists():
return None
data = yaml.safe_load(md.open())
except yaml.YAMLError as exc:
if hasattr(exc, "problem_mark"):
mark = exc.problem_mark
Expand Down
18 changes: 13 additions & 5 deletions juju/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,14 @@ async def add_local_charm_dir(self, charm_dir, series):
:param series: Charm series

"""
fh = tempfile.NamedTemporaryFile()
CharmArchiveGenerator(charm_dir).make_archive(fh.name)
with fh:
if charm_dir.endswith('.charm'):
fn = charm_dir
else:
fn = tempfile.NamedTemporaryFile().name
CharmArchiveGenerator(charm_dir).make_archive(fn)
with open(fn, 'rb') as fh:
func = partial(
self.add_local_charm, fh, series, os.stat(fh.name).st_size)
self.add_local_charm, fh, series, os.stat(fn).st_size)
charm_url = await self._connector.loop.run_in_executor(None, func)

log.debug('Uploaded local charm: %s -> %s', charm_dir, charm_url)
Expand Down Expand Up @@ -1398,6 +1401,7 @@ async def deploy(
if trust and (self.info.agent_version < client.Number.from_json('2.4.0')):
raise NotImplementedError("trusted is not supported on model version {}".format(self.info.agent_version))

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'
Expand Down Expand Up @@ -1452,7 +1456,11 @@ async def deploy(
entity=entity)
else:
if not application_name:
metadata = yaml.load(metadata_path.read_text(), Loader=yaml.FullLoader)
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(
Expand Down