[monitor-control-service] Update api-version with issue fix (#7616)

* add api-version update and enum support extension
Azure · Jun 13, 2024 · 08dbb4c · 08dbb4c
1 parent 39bf141
commit 08dbb4c
Show file tree

Hide file tree

Showing 28 changed files with 2,871 additions and 1,267 deletions.
diff --git a/src/monitor-control-service/HISTORY.rst b/src/monitor-control-service/HISTORY.rst
@@ -2,6 +2,12 @@
 
 Release History
 ===============
+1.1.0
+++++++
+* Update api-version to `2023-03-11`
+* Change default arg type of empty object to be `AAZFreeFormDictArg` to fix deserialization issue
+* Add `enum_support_extension` for Enum arg type
+
 1.0.2
 ++++++
 * `az monitor data-collection rule/endpoint`: Removed the enum limitation for the `--kind` parameter.

diff --git a/...monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_create.py b/...monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_create.py
@@ -22,9 +22,9 @@ class Create(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2022-06-01",
+        "version": "2023-03-11",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2022-06-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2023-03-11"],
         ]
     }
 
@@ -58,7 +58,9 @@ def _build_arguments_schema(cls, *args, **kwargs):
         )
         _args_schema.kind = AAZStrArg(
             options=["--kind"],
-            help="The kind of the resource. Such as `Linux`, `Windows`.",
+            help="The kind of the resource.",
+            enum={"Linux": "Linux", "Windows": "Windows"},
+            enum_support_extension=True,
         )
         _args_schema.location = AAZResourceLocationArg(
             help="The geo-location where the resource lives.",
@@ -81,6 +83,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
             required=True,
             enum={"None": "None", "SystemAssigned": "SystemAssigned", "SystemAssigned,UserAssigned": "SystemAssigned,UserAssigned", "UserAssigned": "UserAssigned"},
+            enum_support_extension=True,
         )
         identity.user_assigned_identities = AAZDictArg(
             options=["user-assigned-identities"],
@@ -104,6 +107,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             arg_group="Network Acls",
             help="The configuration to set whether network access from public internet to the endpoints are allowed.",
             enum={"Disabled": "Disabled", "Enabled": "Enabled", "SecuredByPerimeter": "SecuredByPerimeter"},
+            enum_support_extension=True,
         )
 
         # define Arg Group "Properties"
@@ -174,7 +178,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }
@@ -367,6 +371,10 @@ def _build_schema_on_200_201(cls):
                 serialized_name="provisionedBy",
                 flags={"read_only": True},
             )
+            metadata.provisioned_by_immutable_id = AAZStrType(
+                serialized_name="provisionedByImmutableId",
+                flags={"read_only": True},
+            )
             metadata.provisioned_by_resource_id = AAZStrType(
                 serialized_name="provisionedByResourceId",
                 flags={"read_only": True},

diff --git a/...monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_delete.py b/...monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_delete.py
@@ -23,9 +23,9 @@ class Delete(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2022-06-01",
+        "version": "2023-03-11",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2022-06-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2023-03-11"],
         ]
     }
 
@@ -119,7 +119,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }

diff --git a/src/monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_list.py b/src/monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_list.py
@@ -25,10 +25,10 @@ class List(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2022-06-01",
+        "version": "2023-03-11",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/providers/microsoft.insights/datacollectionendpoints", "2022-06-01"],
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints", "2022-06-01"],
+            ["mgmt-plane", "/subscriptions/{}/providers/microsoft.insights/datacollectionendpoints", "2023-03-11"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints", "2023-03-11"],
         ]
     }
 
@@ -119,7 +119,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }
@@ -283,6 +283,10 @@ def _build_schema_on_200(cls):
                 serialized_name="provisionedBy",
                 flags={"read_only": True},
             )
+            metadata.provisioned_by_immutable_id = AAZStrType(
+                serialized_name="provisionedByImmutableId",
+                flags={"read_only": True},
+            )
             metadata.provisioned_by_resource_id = AAZStrType(
                 serialized_name="provisionedByResourceId",
                 flags={"read_only": True},
@@ -374,7 +378,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }
@@ -538,6 +542,10 @@ def _build_schema_on_200(cls):
                 serialized_name="provisionedBy",
                 flags={"read_only": True},
             )
+            metadata.provisioned_by_immutable_id = AAZStrType(
+                serialized_name="provisionedByImmutableId",
+                flags={"read_only": True},
+            )
             metadata.provisioned_by_resource_id = AAZStrType(
                 serialized_name="provisionedByResourceId",
                 flags={"read_only": True},

diff --git a/src/monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_show.py b/src/monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_show.py
@@ -22,9 +22,9 @@ class Show(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2022-06-01",
+        "version": "2023-03-11",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2022-06-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2023-03-11"],
         ]
     }
 
@@ -120,7 +120,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }
@@ -273,6 +273,10 @@ def _build_schema_on_200(cls):
                 serialized_name="provisionedBy",
                 flags={"read_only": True},
             )
+            metadata.provisioned_by_immutable_id = AAZStrType(
+                serialized_name="provisionedByImmutableId",
+                flags={"read_only": True},
+            )
             metadata.provisioned_by_resource_id = AAZStrType(
                 serialized_name="provisionedByResourceId",
                 flags={"read_only": True},

diff --git a/...monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_update.py b/...monitor-control-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/_update.py
@@ -22,9 +22,9 @@ class Update(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2022-06-01",
+        "version": "2023-03-11",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2022-06-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}", "2023-03-11"],
         ]
     }
 
@@ -62,8 +62,10 @@ def _build_arguments_schema(cls, *args, **kwargs):
         )
         _args_schema.kind = AAZStrArg(
             options=["--kind"],
-            help="The kind of the resource. Such as `Linux`, `Windows`.",
+            help="The kind of the resource.",
             nullable=True,
+            enum={"Linux": "Linux", "Windows": "Windows"},
+            enum_support_extension=True,
         )
         _args_schema.description = AAZStrArg(
             options=["--description"],
@@ -81,6 +83,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             options=["type"],
             help="Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).",
             enum={"None": "None", "SystemAssigned": "SystemAssigned", "SystemAssigned,UserAssigned": "SystemAssigned,UserAssigned", "UserAssigned": "UserAssigned"},
+            enum_support_extension=True,
         )
         identity.user_assigned_identities = AAZDictArg(
             options=["user-assigned-identities"],
@@ -108,6 +111,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
             help="The configuration to set whether network access from public internet to the endpoints are allowed.",
             nullable=True,
             enum={"Disabled": "Disabled", "Enabled": "Enabled", "SecuredByPerimeter": "SecuredByPerimeter"},
+            enum_support_extension=True,
         )
 
         # define Arg Group "Properties"
@@ -191,7 +195,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }
@@ -274,7 +278,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }
@@ -513,6 +517,10 @@ def _build_schema_data_collection_endpoint_resource_read(cls, _schema):
             serialized_name="provisionedBy",
             flags={"read_only": True},
         )
+        metadata.provisioned_by_immutable_id = AAZStrType(
+            serialized_name="provisionedByImmutableId",
+            flags={"read_only": True},
+        )
         metadata.provisioned_by_resource_id = AAZStrType(
             serialized_name="provisionedByResourceId",
             flags={"read_only": True},

diff --git a/...ntrol-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/association/_list.py b/...ntrol-service/azext_amcs/aaz/latest/monitor/data_collection/endpoint/association/_list.py
@@ -19,9 +19,9 @@ class List(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2022-06-01",
+        "version": "2023-03-11",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}/associations", "2022-06-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.insights/datacollectionendpoints/{}/associations", "2023-03-11"],
         ]
     }
 
@@ -118,7 +118,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2022-06-01",
+                    "api-version", "2023-03-11",
                     required=True,
                 ),
             }
@@ -203,6 +203,10 @@ def _build_schema_on_200(cls):
                 serialized_name="provisionedBy",
                 flags={"read_only": True},
             )
+            metadata.provisioned_by_immutable_id = AAZStrType(
+                serialized_name="provisionedByImmutableId",
+                flags={"read_only": True},
+            )
             metadata.provisioned_by_resource_id = AAZStrType(
                 serialized_name="provisionedByResourceId",
                 flags={"read_only": True},