T1 resource 2021 03 05 (Azure#17111)

* CodeGen from PR 13120 in Azure/azure-rest-api-specs Fix swagger KPI issue on additional property "tenantId" in deployment script with api-version 2020-10-01 (Azure#13120) * Update deploymentScripts.json Mark environment variable secureValue as secret * Update deploymentScripts.json Fix a bug in Microsoft.Resources/deploymentScripts where tenantId property is missed from ManagedServiceIdentity. * Fix swagger KPI issue on additional property "tenantId" in deployment script with api-version 2020-10-01 * Update deploymentScripts.json * update retentionInterval description. * test,version,CHANGELOG Co-authored-by: SDKAuto <[email protected]> Co-authored-by: Yan Zhang (WICRESOFT NORTH AMERICA LTD) <[email protected]>
AzureSDKAutomation · Mar 5, 2021 · 561abe2 · 561abe2
1 parent ecf2941
commit 561abe2
Show file tree

Hide file tree

Showing 19 changed files with 1,202 additions and 140 deletions.
diff --git a/sdk/resources/azure-mgmt-resource/CHANGELOG.md b/sdk/resources/azure-mgmt-resource/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Release History
 
+## 12.1.0 (2021-03-05)
+
+**Features**
+
+  - Model ManagedServiceIdentity has a new parameter tenant_id
+  - Added operation group PolicyExemptionsOperations
+
 ## 12.0.0 (2020-12-08)
 
 **Breaking changes**

diff --git a/...mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models.py b/...mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models.py
@@ -150,7 +150,8 @@ class AzureCliScript(DeploymentScript):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -184,10 +185,10 @@ class AzureCliScript(DeploymentScript):
     :param retention_interval: Required. Interval for which the service
      retains the script resource after it reaches a terminal state. Resource
      will be deleted when this duration expires. Duration is based on ISO 8601
-     pattern (for example P7D means one week).
+     pattern (for example P1D means one day).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     :param az_cli_version: Required. Azure CLI module version to be used.
     :type az_cli_version: str
@@ -239,7 +240,7 @@ def __init__(self, **kwargs):
         super(AzureCliScript, self).__init__(**kwargs)
         self.container_settings = kwargs.get('container_settings', None)
         self.storage_account_settings = kwargs.get('storage_account_settings', None)
-        self.cleanup_preference = kwargs.get('cleanup_preference', None)
+        self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
         self.provisioning_state = None
         self.status = None
         self.outputs = None
@@ -250,7 +251,7 @@ def __init__(self, **kwargs):
         self.environment_variables = kwargs.get('environment_variables', None)
         self.force_update_tag = kwargs.get('force_update_tag', None)
         self.retention_interval = kwargs.get('retention_interval', None)
-        self.timeout = kwargs.get('timeout', None)
+        self.timeout = kwargs.get('timeout', "P1D")
         self.az_cli_version = kwargs.get('az_cli_version', None)
         self.kind = 'AzureCLI'
 
@@ -291,7 +292,8 @@ class AzurePowerShellScript(DeploymentScript):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -325,10 +327,10 @@ class AzurePowerShellScript(DeploymentScript):
     :param retention_interval: Required. Interval for which the service
      retains the script resource after it reaches a terminal state. Resource
      will be deleted when this duration expires. Duration is based on ISO 8601
-     pattern (for example P7D means one week).
+     pattern (for example P1D means one day).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     :param az_power_shell_version: Required. Azure PowerShell module version
      to be used.
@@ -381,7 +383,7 @@ def __init__(self, **kwargs):
         super(AzurePowerShellScript, self).__init__(**kwargs)
         self.container_settings = kwargs.get('container_settings', None)
         self.storage_account_settings = kwargs.get('storage_account_settings', None)
-        self.cleanup_preference = kwargs.get('cleanup_preference', None)
+        self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
         self.provisioning_state = None
         self.status = None
         self.outputs = None
@@ -392,7 +394,7 @@ def __init__(self, **kwargs):
         self.environment_variables = kwargs.get('environment_variables', None)
         self.force_update_tag = kwargs.get('force_update_tag', None)
         self.retention_interval = kwargs.get('retention_interval', None)
-        self.timeout = kwargs.get('timeout', None)
+        self.timeout = kwargs.get('timeout', "P1D")
         self.az_power_shell_version = kwargs.get('az_power_shell_version', None)
         self.kind = 'AzurePowerShell'
 
@@ -450,7 +452,8 @@ class DeploymentScriptPropertiesBase(Model):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -484,7 +487,7 @@ def __init__(self, **kwargs):
         super(DeploymentScriptPropertiesBase, self).__init__(**kwargs)
         self.container_settings = kwargs.get('container_settings', None)
         self.storage_account_settings = kwargs.get('storage_account_settings', None)
-        self.cleanup_preference = kwargs.get('cleanup_preference', None)
+        self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
         self.provisioning_state = None
         self.status = None
         self.outputs = None
@@ -663,19 +666,26 @@ def __init__(self, **kwargs):
 class ManagedServiceIdentity(Model):
     """Managed identity generic object.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     :param type: Type of the managed identity. Possible values include:
      'UserAssigned'
     :type type: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.ManagedServiceIdentityType
-    :param tenant_id: ID of the Azure Active Directory.
-    :type tenant_id: str
+    :ivar tenant_id: ID of the Azure Active Directory.
+    :vartype tenant_id: str
     :param user_assigned_identities: The list of user-assigned managed
      identities associated with the resource. Key is the Azure resource Id of
      the managed identity.
     :type user_assigned_identities: dict[str,
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.UserAssignedIdentity]
     """
 
+    _validation = {
+        'tenant_id': {'readonly': True},
+    }
+
     _attribute_map = {
         'type': {'key': 'type', 'type': 'str'},
         'tenant_id': {'key': 'tenantId', 'type': 'str'},
@@ -685,7 +695,7 @@ class ManagedServiceIdentity(Model):
     def __init__(self, **kwargs):
         super(ManagedServiceIdentity, self).__init__(**kwargs)
         self.type = kwargs.get('type', None)
-        self.tenant_id = kwargs.get('tenant_id', None)
+        self.tenant_id = None
         self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
 
 
@@ -716,10 +726,10 @@ class ScriptConfigurationBase(Model):
     :param retention_interval: Required. Interval for which the service
      retains the script resource after it reaches a terminal state. Resource
      will be deleted when this duration expires. Duration is based on ISO 8601
-     pattern (for example P7D means one week).
+     pattern (for example P1D means one day).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     """
 
@@ -748,7 +758,7 @@ def __init__(self, **kwargs):
         self.environment_variables = kwargs.get('environment_variables', None)
         self.force_update_tag = kwargs.get('force_update_tag', None)
         self.retention_interval = kwargs.get('retention_interval', None)
-        self.timeout = kwargs.get('timeout', None)
+        self.timeout = kwargs.get('timeout', "P1D")
 
 
 class ScriptLog(AzureResourceBase):
@@ -890,8 +900,7 @@ class SystemData(Model):
      'ManagedIdentity', 'Key'
     :type last_modified_by_type: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CreatedByType
-    :param last_modified_at: The type of identity that last modified the
-     resource.
+    :param last_modified_at: The timestamp of resource last modification (UTC)
     :type last_modified_at: datetime
     """
 
@@ -917,19 +926,27 @@ def __init__(self, **kwargs):
 class UserAssignedIdentity(Model):
     """User-assigned managed identity.
 
-    :param principal_id: Azure Active Directory principal ID associated with
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: Azure Active Directory principal ID associated with
      this identity.
-    :type principal_id: str
-    :param client_id: Client App Id associated with this identity.
-    :type client_id: str
+    :vartype principal_id: str
+    :ivar client_id: Client App Id associated with this identity.
+    :vartype client_id: str
     """
 
+    _validation = {
+        'principal_id': {'readonly': True},
+        'client_id': {'readonly': True},
+    }
+
     _attribute_map = {
         'principal_id': {'key': 'principalId', 'type': 'str'},
         'client_id': {'key': 'clientId', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(UserAssignedIdentity, self).__init__(**kwargs)
-        self.principal_id = kwargs.get('principal_id', None)
-        self.client_id = kwargs.get('client_id', None)
+        self.principal_id = None
+        self.client_id = None