Merge pull request #400 from kairu-ms/fix-loganalytics

Support swagger `base_path`
Azure · Sep 18, 2024 · a8ee611 · a8ee611
2 parents 4e10d74 + ad2d8c5
commit a8ee611
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/aaz_dev/cli/templates/aaz/profile/_clients.py.j2 b/src/aaz_dev/cli/templates/aaz/profile/_clients.py.j2
@@ -48,6 +48,8 @@ class {{ client.cls_name }}(AAZBaseClient):
         {%- else %}
         endpoint = cls.get_cloud_endpoint(ctx, cls._CLOUD_HOST_METADATA_INDEX)
         {%- endif %}
+        {%- else %}
+        endpoint = None
         {%- endif %}
         if not endpoint:
             endpoint = cls._CLOUD_HOST_TEMPLATES.get(ctx.cli_ctx.cloud.name, None)

diff --git a/src/aaz_dev/swagger/controller/command_generator.py b/src/aaz_dev/swagger/controller/command_generator.py
@@ -11,6 +11,7 @@
 from swagger.model.schema.cmd_builder import CMDBuilder
 from swagger.model.schema.fields import MutabilityEnum
 from swagger.model.schema.path_item import PathItem
+from swagger.model.schema.x_ms_parameterized_host import XmsParameterizedHost
 from swagger.model.specs import SwaggerLoader
 from swagger.model.specs._utils import operation_id_separate, camel_case_to_snake_case, get_url_path_valid_parts
 from swagger.model.schema.typespec.path_item import TypeSpecPathItem
@@ -549,7 +550,10 @@ def get_path_item(self, resource):
 
     def get_parameterized_host(self, resource):
         swagger = self.loader.get_loaded(resource.file_path)
-        return swagger.x_ms_parameterized_host
+        if swagger.x_ms_parameterized_host:
+            return swagger.x_ms_parameterized_host
+        elif swagger.base_path:
+            return XmsParameterizedHost({"hostTemplate": swagger.base_path})
 
     def generate_operation(self, cmd_builder, path_item, instance_var, **kwargs):
         assert isinstance(path_item, PathItem)