generated from typespec:c7682eb75855c88b6e6f60c55ae4a8602c9cbd81

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: ChenxiJiang333

sdk/security/azure-mgmt-security/CHANGELOG.md

@@ -33,7 +33,7 @@
     "SubAssessmentsAPI": "2019-01-01-preview",
     "TasksAPI": "2015-06-01-preview"
   },
-  "commit": "1a92dbdf52cd3ed15fb9f66c951fcf903e6a49d4",
+  "commit": "c7682eb75855c88b6e6f60c55ae4a8602c9cbd81",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "typespec_src": "specification/security/resource-manager/Microsoft.Security/Security",
   "emitterVersion": "0.61.3"

sdk/security/azure-mgmt-security/_metadata.json

@@ -41,7 +41,6 @@
         "azure.mgmt.security.models.ArcAutoProvisioningConfiguration": "SecurityConnectorsAPI.ArcAutoProvisioningConfiguration",
         "azure.mgmt.security.models.ArcAutoProvisioningGcp": "SecurityConnectorsAPI.arcAutoProvisioningGcp",
         "azure.mgmt.security.models.ArmErrorAdditionalInfo": "Azure.ResourceManager.CommonTypes.ErrorAdditionalInfo",
-        "azure.mgmt.security.models.ArmResourceDetails": "Common.ResourceDetails",
         "azure.mgmt.security.models.AscLocation": "LocationsAPI.AscLocation",
         "azure.mgmt.security.models.AssessmentLinks": "AssessmentAPI.AssessmentLinks",
         "azure.mgmt.security.models.AssessmentStatus": "AssessmentAPI.AssessmentStatus",
@@ -85,6 +84,7 @@
         "azure.mgmt.security.models.AzureDevOpsRepository": "SecurityConnectorsDevOpsAPI.AzureDevOpsRepository",
         "azure.mgmt.security.models.AzureDevOpsRepositoryProperties": "SecurityConnectorsDevOpsAPI.AzureDevOpsRepositoryProperties",
         "azure.mgmt.security.models.AzureDevOpsScopeEnvironmentData": "SecurityConnectorsAPI.AzureDevOpsScopeEnvironmentData",
+        "azure.mgmt.security.models.CommonResourceDetails": "Common.ResourceDetails",
         "azure.mgmt.security.models.AzureResourceDetails": "AssessmentAPI.AzureResourceDetails",
         "azure.mgmt.security.models.ResourceIdentifier": "AlertsAPI.ResourceIdentifier",
         "azure.mgmt.security.models.AzureResourceIdentifier": "AlertsAPI.AzureResourceIdentifier",

sdk/security/azure-mgmt-security/apiview-properties.json

@@ -6761,8 +6761,8 @@ async def create_or_update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-08-01-preview"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.InformationProtectionPolicy] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
@@ -6775,8 +6775,8 @@ async def create_or_update(
         _request = build_information_protection_policies_create_or_update_request(
             resource_id=resource_id,
             information_protection_policy_name=information_protection_policy_name,
-            content_type=content_type,
             api_version=api_version,
+            content_type=content_type,
             content=_content,
             headers=_headers,
             params=_params,
@@ -15282,8 +15282,8 @@ async def create_or_update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-08-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.SecurityStandard] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
@@ -15296,8 +15296,8 @@ async def create_or_update(
         _request = build_security_standards_create_or_update_request(
             resource_id=resource_id,
             standard_id=standard_id,
-            content_type=content_type,
             api_version=api_version,
+            content_type=content_type,
             content=_content,
             headers=_headers,
             params=_params,
@@ -16110,8 +16110,8 @@ async def create_or_update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-08-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.CustomRecommendation] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
@@ -16124,8 +16124,8 @@ async def create_or_update(
         _request = build_custom_recommendations_create_or_update_request(
             resource_id=resource_id,
             custom_recommendation_name=custom_recommendation_name,
-            content_type=content_type,
             api_version=api_version,
+            content_type=content_type,
             content=_content,
             headers=_headers,
             params=_params,

sdk/security/azure-mgmt-security/azure/mgmt/security/aio/operations/_operations.py

@@ -47,7 +47,6 @@
     ArcAutoProvisioningConfiguration,
     ArcAutoProvisioningGcp,
     ArmErrorAdditionalInfo,
-    ArmResourceDetails,
     AscLocation,
     AssessmentLinks,
     AssessmentStatus,
@@ -106,6 +105,7 @@
     CloudError,
     CloudErrorBody,
     CloudOffering,
+    CommonResourceDetails,
     Compliance,
     ComplianceProperties,
     ComplianceResult,
@@ -577,7 +577,6 @@
     "ArcAutoProvisioningConfiguration",
     "ArcAutoProvisioningGcp",
     "ArmErrorAdditionalInfo",
-    "ArmResourceDetails",
     "AscLocation",
     "AssessmentLinks",
     "AssessmentStatus",
@@ -636,6 +635,7 @@
     "CloudError",
     "CloudErrorBody",
     "CloudOffering",
+    "CommonResourceDetails",
     "Compliance",
     "ComplianceProperties",
     "ComplianceResult",

sdk/security/azure-mgmt-security/azure/mgmt/security/models/__init__.py

@@ -1871,40 +1871,6 @@ class ArmErrorAdditionalInfo(_Model):
     """The additional info."""
 
 
-class ArmResourceDetails(_Model):
-    """Details of the resource that was assessed.
-
-    You probably want to use the sub-classes and not this class directly. Known sub-classes are:
-    AzureResourceDetails
-
-    :ivar source: The platform where the assessed resource resides. Required. Known values are:
-     "Azure", "OnPremise", "OnPremiseSql", "Aws", and "Gcp".
-    :vartype source: str or ~azure.mgmt.security.models.Source
-    """
-
-    __mapping__: dict[str, _Model] = {}
-    source: str = rest_discriminator(name="source", visibility=["read", "create", "update", "delete", "query"])
-    """The platform where the assessed resource resides. Required. Known values are: \"Azure\",
-     \"OnPremise\", \"OnPremiseSql\", \"Aws\", and \"Gcp\"."""
-
-    @overload
-    def __init__(
-        self,
-        *,
-        source: str,
-    ) -> None: ...
-
-    @overload
-    def __init__(self, mapping: Mapping[str, Any]) -> None:
-        """
-        :param mapping: raw JSON to initialize the model.
-        :type mapping: Mapping[str, Any]
-        """
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-
-
 class AscLocation(ProxyResource):
     """The ASC location of the subscription is in the "name" field.
 
@@ -3950,7 +3916,41 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         self.environment_type = EnvironmentType.AZURE_DEV_OPS_SCOPE  # type: ignore
 
 
-class AzureResourceDetails(ArmResourceDetails, discriminator="Azure"):
+class CommonResourceDetails(_Model):
+    """Details of the resource that was assessed.
+
+    You probably want to use the sub-classes and not this class directly. Known sub-classes are:
+    AzureResourceDetails
+
+    :ivar source: The platform where the assessed resource resides. Required. Known values are:
+     "Azure", "OnPremise", "OnPremiseSql", "Aws", and "Gcp".
+    :vartype source: str or ~azure.mgmt.security.models.Source
+    """
+
+    __mapping__: dict[str, _Model] = {}
+    source: str = rest_discriminator(name="source", visibility=["read", "create", "update", "delete", "query"])
+    """The platform where the assessed resource resides. Required. Known values are: \"Azure\",
+     \"OnPremise\", \"OnPremiseSql\", \"Aws\", and \"Gcp\"."""
+
+    @overload
+    def __init__(
+        self,
+        *,
+        source: str,
+    ) -> None: ...
+
+    @overload
+    def __init__(self, mapping: Mapping[str, Any]) -> None:
+        """
+        :param mapping: raw JSON to initialize the model.
+        :type mapping: Mapping[str, Any]
+        """
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+
+
+class AzureResourceDetails(CommonResourceDetails, discriminator="Azure"):
     """Details of the Azure resource that was assessed.
 
     :ivar id: Azure resource Id of the assessed resource.
@@ -15753,7 +15753,7 @@ class SecurityAssessmentPropertiesBase(_Model):
     :ivar risk: External model of risk result.
     :vartype risk: ~azure.mgmt.security.models.SecurityAssessmentPropertiesBaseRisk
     :ivar resource_details: Details of the resource that was assessed. Required.
-    :vartype resource_details: ~azure.mgmt.security.models.ArmResourceDetails
+    :vartype resource_details: ~azure.mgmt.security.models.CommonResourceDetails
     :ivar display_name: User friendly display name of the assessment.
     :vartype display_name: str
     :ivar additional_data: Additional data regarding the assessment.
@@ -15770,7 +15770,7 @@ class SecurityAssessmentPropertiesBase(_Model):
         visibility=["read", "create", "update", "delete", "query"]
     )
     """External model of risk result."""
-    resource_details: "_models.ArmResourceDetails" = rest_field(
+    resource_details: "_models.CommonResourceDetails" = rest_field(
         name="resourceDetails", visibility=["read", "create", "update", "delete", "query"]
     )
     """Details of the resource that was assessed. Required."""
@@ -15795,7 +15795,7 @@ class SecurityAssessmentPropertiesBase(_Model):
     def __init__(
         self,
         *,
-        resource_details: "_models.ArmResourceDetails",
+        resource_details: "_models.CommonResourceDetails",
         risk: Optional["_models.SecurityAssessmentPropertiesBaseRisk"] = None,
         additional_data: Optional[dict[str, str]] = None,
         metadata: Optional["_models.SecurityAssessmentMetadataProperties"] = None,
@@ -15819,7 +15819,7 @@ class SecurityAssessmentProperties(SecurityAssessmentPropertiesBase):
     :ivar risk: External model of risk result.
     :vartype risk: ~azure.mgmt.security.models.SecurityAssessmentPropertiesBaseRisk
     :ivar resource_details: Details of the resource that was assessed. Required.
-    :vartype resource_details: ~azure.mgmt.security.models.ArmResourceDetails
+    :vartype resource_details: ~azure.mgmt.security.models.CommonResourceDetails
     :ivar display_name: User friendly display name of the assessment.
     :vartype display_name: str
     :ivar additional_data: Additional data regarding the assessment.
@@ -15841,7 +15841,7 @@ class SecurityAssessmentProperties(SecurityAssessmentPropertiesBase):
     def __init__(
         self,
         *,
-        resource_details: "_models.ArmResourceDetails",
+        resource_details: "_models.CommonResourceDetails",
         status: "_models.AssessmentStatus",
         risk: Optional["_models.SecurityAssessmentPropertiesBaseRisk"] = None,
         additional_data: Optional[dict[str, str]] = None,
@@ -16039,7 +16039,7 @@ class SecurityAssessmentPropertiesResponse(SecurityAssessmentPropertiesBase):
     :ivar risk: External model of risk result.
     :vartype risk: ~azure.mgmt.security.models.SecurityAssessmentPropertiesBaseRisk
     :ivar resource_details: Details of the resource that was assessed. Required.
-    :vartype resource_details: ~azure.mgmt.security.models.ArmResourceDetails
+    :vartype resource_details: ~azure.mgmt.security.models.CommonResourceDetails
     :ivar display_name: User friendly display name of the assessment.
     :vartype display_name: str
     :ivar additional_data: Additional data regarding the assessment.
@@ -16061,7 +16061,7 @@ class SecurityAssessmentPropertiesResponse(SecurityAssessmentPropertiesBase):
     def __init__(
         self,
         *,
-        resource_details: "_models.ArmResourceDetails",
+        resource_details: "_models.CommonResourceDetails",
         status: "_models.AssessmentStatusResponse",
         risk: Optional["_models.SecurityAssessmentPropertiesBaseRisk"] = None,
         additional_data: Optional[dict[str, str]] = None,
@@ -17033,7 +17033,7 @@ class SecuritySubAssessmentProperties(_Model):
     :ivar time_generated: The date and time the sub-assessment was generated.
     :vartype time_generated: ~datetime.datetime
     :ivar resource_details: Details of the resource that was assessed.
-    :vartype resource_details: ~azure.mgmt.security.models.ArmResourceDetails
+    :vartype resource_details: ~azure.mgmt.security.models.CommonResourceDetails
     :ivar additional_data: Details of the sub-assessment.
     :vartype additional_data: ~azure.mgmt.security.models.AdditionalData
     """
@@ -17058,7 +17058,7 @@ class SecuritySubAssessmentProperties(_Model):
         name="timeGenerated", visibility=["read"], format="rfc3339"
     )
     """The date and time the sub-assessment was generated."""
-    resource_details: Optional["_models.ArmResourceDetails"] = rest_field(
+    resource_details: Optional["_models.CommonResourceDetails"] = rest_field(
         name="resourceDetails", visibility=["read", "create", "update", "delete", "query"]
     )
     """Details of the resource that was assessed."""
@@ -17072,7 +17072,7 @@ def __init__(
         self,
         *,
         status: Optional["_models.SubAssessmentStatus"] = None,
-        resource_details: Optional["_models.ArmResourceDetails"] = None,
+        resource_details: Optional["_models.CommonResourceDetails"] = None,
         additional_data: Optional["_models.AdditionalData"] = None,
     ) -> None: ...
 

sdk/security/azure-mgmt-security/azure/mgmt/security/models/_models.py

@@ -1710,8 +1710,8 @@ def build_information_protection_policies_create_or_update_request(  # pylint: d
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-08-01-preview"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -3894,8 +3894,8 @@ def build_security_standards_create_or_update_request(  # pylint: disable=name-t
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-08-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -4096,8 +4096,8 @@ def build_custom_recommendations_create_or_update_request(  # pylint: disable=na
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
     _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-08-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
@@ -13873,8 +13873,8 @@ def create_or_update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2017-08-01-preview"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.InformationProtectionPolicy] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
@@ -13887,8 +13887,8 @@ def create_or_update(
         _request = build_information_protection_policies_create_or_update_request(
             resource_id=resource_id,
             information_protection_policy_name=information_protection_policy_name,
-            content_type=content_type,
             api_version=api_version,
+            content_type=content_type,
             content=_content,
             headers=_headers,
             params=_params,
@@ -22364,8 +22364,8 @@ def create_or_update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-08-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.SecurityStandard] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
@@ -22378,8 +22378,8 @@ def create_or_update(
         _request = build_security_standards_create_or_update_request(
             resource_id=resource_id,
             standard_id=standard_id,
-            content_type=content_type,
             api_version=api_version,
+            content_type=content_type,
             content=_content,
             headers=_headers,
             params=_params,
@@ -23194,8 +23194,8 @@ def create_or_update(
         _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-08-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
         cls: ClsType[_models.CustomRecommendation] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
@@ -23208,8 +23208,8 @@ def create_or_update(
         _request = build_custom_recommendations_create_or_update_request(
             resource_id=resource_id,
             custom_recommendation_name=custom_recommendation_name,
-            content_type=content_type,
             api_version=api_version,
+            content_type=content_type,
             content=_content,
             headers=_headers,
             params=_params,