Skip to content

fix autogen cmd #444

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
kairu-ms merged 4 commits into from
Mar 3, 2025
Merged

fix autogen cmd #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17fb371
fix autogen cmd
AllyW Jan 20, 2025
f7612ec
fix reg
AllyW Jan 20, 2025
79a9617
update client cfg in swagger generation
AllyW Feb 18, 2025
834f309
fix regre
AllyW Feb 28, 2025
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
2 changes: 1 addition & 1 deletion src/aaz_dev/command/api/_cmds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def generate_command_models_from_swagger(swagger_tag, workspace_path=None):
"id": resource_id
})

mod_names = Config.DEFAULT_SWAGGER_MODULE.split('/')
mod_names = Config.DEFAULT_SWAGGER_MODULE
ws = WorkspaceManager.new(
name=Config.DEFAULT_SWAGGER_MODULE,
plane=Config.DEFAULT_PLANE,
Expand Down
10 changes: 6 additions & 4 deletions src/aaz_dev/command/controller/workspace_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,10 +1070,12 @@ def generate_to_aaz(self):
# Merge the commands of subresources which exported in aaz but not exist in current workspace
self._merge_sub_resources_in_aaz()

# update client config
editor = self.load_client_cfg_editor()
if editor:
self.aaz_specs.update_client_cfg(editor.cfg)
# in memory worspace folder does not support client cfg
if not self.is_in_memory:
# update client config
editor = self.load_client_cfg_editor()
if editor:
self.aaz_specs.update_client_cfg(editor.cfg)

# update configurations
for ws_leaf in self.iter_command_tree_leaves():
Expand Down
2 changes: 1 addition & 1 deletion src/aaz_dev/swagger/model/specs/_resource_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def _parse_readme_input_file_tags(self):
readme = f.read()

re_yaml = re.compile(
r'```\s*yaml\s*(.*\$\(\s*tag\s*\)\s*==\s*[\'"]\s*(.*)\s*[\'"].*)?\n((((?!```).)*\n)*)\s*```\s*\n',
r'```\s*yaml\s*(.*\$\(\s*tag\s*\)\s*==\s*[\'"]\s*(.*)\s*[\'"].*)?\n((((?!```).)*\n)*)\s*```\s*',
flags=re.MULTILINE)
for piece in re_yaml.finditer(readme):
flags = piece[1]
Expand Down