Skip to content

fix: use version sorting in codegen, not lexical #1174

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 3 commits into from
Oct 28, 2024
Merged

fix: use version sorting in codegen, not lexical #1174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
364082b
fix: don't use lexical sorting for version numbers in codegen
james-garner-canonical Oct 18, 2024
84ccfe8
chore: simpler code
dimaqq Oct 22, 2024
b2f118b
chore: remove special casing of 'latest' string when loading schemas
james-garner-canonical Oct 28, 2024
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
26 changes: 11 additions & 15 deletions juju/client/facade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
from collections import defaultdict
from glob import glob
from pathlib import Path
from typing import Any, Mapping, Sequence, TypeVar
from typing import Any, Dict, List, Mapping, Sequence

import packaging.version
import typing_inspect

from . import codegen
Expand Down Expand Up @@ -150,7 +151,7 @@ def get(self, name):
# Two way mapping
refname = self.schema.referenceName(name)
if refname not in self:
result = TypeVar(refname)
result = typing.TypeVar(refname)
self[refname] = result
self[result] = refname

Expand Down Expand Up @@ -926,11 +927,11 @@ def generate_definitions(schemas):
return definitions


def generate_facades(schemas):
def generate_facades(schemas: Dict[str, List[Schema]]) -> Dict[str, Dict[int, codegen.Capture]]:
captures = defaultdict(codegen.Capture)

# Build the Facade classes
for juju_version in sorted(schemas.keys()):
for juju_version in sorted(schemas.keys(), key=packaging.version.parse):
for schema in schemas[juju_version]:
cls, source = buildFacade(schema)
cls_name = "{}Facade".format(schema.name)
Expand All @@ -953,18 +954,13 @@ def generate_facades(schemas):

def load_schemas(options):
schemas = {}

for p in sorted(glob(options.schema)):
if 'latest' in p:
juju_version = 'latest'
else:
try:
juju_version = re.search(JUJU_VERSION, p).group()
except AttributeError:
print("Cannot extract a juju version from {}".format(p))
print("Schemas must include a juju version in the filename")
raise SystemExit(1)

try:
juju_version = re.search(JUJU_VERSION, p).group()
except AttributeError:
print("Cannot extract a juju version from {}".format(p))
print("Schemas must include a juju version in the filename")
raise SystemExit(1)
new_schemas = json.loads(Path(p).read_text("utf-8"))
schemas[juju_version] = [Schema(s) for s in new_schemas]
return schemas
Expand Down