CodeGen from PR 12192 in Azure/azure-rest-api-specs

Merge f4a222d6c44b46343ff88e733c320e825eba0ddd into d266093

Author: SDKAuto

sdk/kubernetesconfiguration/azure-mgmt-kubernetesconfiguration/azure/mgmt/kubernetesconfiguration/_source_control_configuration_client.py

@@ -45,7 +45,7 @@ def __init__(
         super(SourceControlConfigurationClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2019-11-01-preview'
+        self.api_version = '2020-10-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

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

@@ -20,6 +20,7 @@
     from ._models_py3 import ResourceProviderOperationDisplay
     from ._models_py3 import Result
     from ._models_py3 import SourceControlConfiguration
+    from ._models_py3 import SystemData
 except (SyntaxError, ImportError):
     from ._models import ComplianceStatus
     from ._models import ErrorDefinition
@@ -31,15 +32,15 @@
     from ._models import ResourceProviderOperationDisplay
     from ._models import Result
     from ._models import SourceControlConfiguration
+    from ._models import SystemData
 from ._paged_models import ResourceProviderOperationPaged
 from ._paged_models import SourceControlConfigurationPaged
 from ._source_control_configuration_client_enums import (
-    ComplianceState,
-    MessageLevel,
+    ComplianceStateType,
+    MessageLevelType,
     OperatorType,
-    OperatorScope,
-    EnableHelmOperator,
-    ProvisioningState,
+    OperatorScopeType,
+    ProvisioningStateType,
 )
 
 __all__ = [
@@ -53,12 +54,12 @@
     'ResourceProviderOperationDisplay',
     'Result',
     'SourceControlConfiguration',
+    'SystemData',
     'SourceControlConfigurationPaged',
     'ResourceProviderOperationPaged',
-    'ComplianceState',
-    'MessageLevel',
+    'ComplianceStateType',
+    'MessageLevelType',
     'OperatorType',
-    'OperatorScope',
-    'EnableHelmOperator',
-    'ProvisioningState',
+    'OperatorScopeType',
+    'ProvisioningStateType',
 ]

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

@@ -31,15 +31,15 @@ class ComplianceStatus(Model):
      Possible values include: 'Pending', 'Compliant', 'Noncompliant',
      'Installed', 'Failed'
     :vartype compliance_state: str or
-     ~azure.mgmt.kubernetesconfiguration.models.ComplianceState
+     ~azure.mgmt.kubernetesconfiguration.models.ComplianceStateType
     :param last_config_applied: Datetime the configuration was last applied.
     :type last_config_applied: datetime
     :param message: Message from when the configuration was applied.
     :type message: str
     :param message_level: Level of the message. Possible values include:
      'Error', 'Warning', 'Information'
     :type message_level: str or
-     ~azure.mgmt.kubernetesconfiguration.models.MessageLevel
+     ~azure.mgmt.kubernetesconfiguration.models.MessageLevelType
     """
 
     _validation = {
@@ -64,36 +64,29 @@ def __init__(self, **kwargs):
 class ErrorDefinition(Model):
     """Error definition.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
+    All required parameters must be populated in order to send to Azure.
 
-    :ivar code: Service specific error code which serves as the substatus for
-     the HTTP error code.
-    :vartype code: str
-    :ivar message: Description of the error.
-    :vartype message: str
-    :ivar details: Internal error details.
-    :vartype details:
-     list[~azure.mgmt.kubernetesconfiguration.models.ErrorDefinition]
+    :param code: Required. Service specific error code which serves as the
+     substatus for the HTTP error code.
+    :type code: str
+    :param message: Required. Description of the error.
+    :type message: str
     """
 
     _validation = {
-        'code': {'readonly': True},
-        'message': {'readonly': True},
-        'details': {'readonly': True},
+        'code': {'required': True},
+        'message': {'required': True},
     }
 
     _attribute_map = {
         'code': {'key': 'code', 'type': 'str'},
         'message': {'key': 'message', 'type': 'str'},
-        'details': {'key': 'details', 'type': '[ErrorDefinition]'},
     }
 
     def __init__(self, **kwargs):
         super(ErrorDefinition, self).__init__(**kwargs)
-        self.code = None
-        self.message = None
-        self.details = None
+        self.code = kwargs.get('code', None)
+        self.message = kwargs.get('message', None)
 
 
 class ErrorResponse(Model):
@@ -156,6 +149,9 @@ class Resource(Model):
     :vartype name: str
     :ivar type: Resource type
     :vartype type: str
+    :param system_data: Top level metadata
+     https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources
+    :type system_data: ~azure.mgmt.kubernetesconfiguration.models.SystemData
     """
 
     _validation = {
@@ -168,13 +164,15 @@ class Resource(Model):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
+        'system_data': {'key': 'systemData', 'type': 'SystemData'},
     }
 
     def __init__(self, **kwargs):
         super(Resource, self).__init__(**kwargs)
         self.id = None
         self.name = None
         self.type = None
+        self.system_data = kwargs.get('system_data', None)
 
 
 class ProxyResource(Resource):
@@ -189,6 +187,9 @@ class ProxyResource(Resource):
     :vartype name: str
     :ivar type: Resource type
     :vartype type: str
+    :param system_data: Top level metadata
+     https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources
+    :type system_data: ~azure.mgmt.kubernetesconfiguration.models.SystemData
     """
 
     _validation = {
@@ -201,6 +202,7 @@ class ProxyResource(Resource):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
+        'system_data': {'key': 'systemData', 'type': 'SystemData'},
     }
 
     def __init__(self, **kwargs):
@@ -210,23 +212,35 @@ def __init__(self, **kwargs):
 class ResourceProviderOperation(Model):
     """Supported operation of this resource provider.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     :param name: Operation name, in format of
      {provider}/{resource}/{operation}
     :type name: str
     :param display: Display metadata associated with the operation.
     :type display:
      ~azure.mgmt.kubernetesconfiguration.models.ResourceProviderOperationDisplay
+    :ivar is_data_action: The flag that indicates whether the operation
+     applies to data plane.
+    :vartype is_data_action: bool
     """
 
+    _validation = {
+        'is_data_action': {'readonly': True},
+    }
+
     _attribute_map = {
         'name': {'key': 'name', 'type': 'str'},
         'display': {'key': 'display', 'type': 'ResourceProviderOperationDisplay'},
+        'is_data_action': {'key': 'isDataAction', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):
         super(ResourceProviderOperation, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.display = kwargs.get('display', None)
+        self.is_data_action = None
 
 
 class ResourceProviderOperationDisplay(Model):
@@ -274,7 +288,7 @@ def __init__(self, **kwargs):
 
 
 class SourceControlConfiguration(ProxyResource):
-    """The SourceControl Configuration object.
+    """The SourceControl Configuration object returned in Get & Put response.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -285,6 +299,9 @@ class SourceControlConfiguration(ProxyResource):
     :vartype name: str
     :ivar type: Resource type
     :vartype type: str
+    :param system_data: Top level metadata
+     https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources
+    :type system_data: ~azure.mgmt.kubernetesconfiguration.models.SystemData
     :param repository_url: Url of the SourceControl Repository.
     :type repository_url: str
     :param operator_namespace: The namespace to which this operator is
@@ -301,27 +318,32 @@ class SourceControlConfiguration(ProxyResource):
     :param operator_params: Any Parameters for the Operator instance in string
      format.
     :type operator_params: str
+    :param configuration_protected_settings: Name-value pairs of protected
+     configuration settings for the configuration
+    :type configuration_protected_settings: dict[str, str]
     :param operator_scope: Scope at which the operator will be installed.
      Possible values include: 'cluster', 'namespace'. Default value: "cluster"
      .
     :type operator_scope: str or
-     ~azure.mgmt.kubernetesconfiguration.models.OperatorScope
+     ~azure.mgmt.kubernetesconfiguration.models.OperatorScopeType
     :ivar repository_public_key: Public Key associated with this SourceControl
      configuration (either generated within the cluster or provided by the
      user).
     :vartype repository_public_key: str
+    :param ssh_known_hosts_contents: Base64-encoded known_hosts contents
+     containing public SSH keys required to access private Git instances
+    :type ssh_known_hosts_contents: str
     :param enable_helm_operator: Option to enable Helm Operator for this git
-     configuration. Possible values include: 'true', 'false'
-    :type enable_helm_operator: str or
-     ~azure.mgmt.kubernetesconfiguration.models.EnableHelmOperator
+     configuration.
+    :type enable_helm_operator: bool
     :param helm_operator_properties: Properties for Helm operator.
     :type helm_operator_properties:
      ~azure.mgmt.kubernetesconfiguration.models.HelmOperatorProperties
     :ivar provisioning_state: The provisioning state of the resource provider.
      Possible values include: 'Accepted', 'Deleting', 'Running', 'Succeeded',
      'Failed'
     :vartype provisioning_state: str or
-     ~azure.mgmt.kubernetesconfiguration.models.ProvisioningState
+     ~azure.mgmt.kubernetesconfiguration.models.ProvisioningStateType
     :ivar compliance_status: Compliance Status of the Configuration
     :vartype compliance_status:
      ~azure.mgmt.kubernetesconfiguration.models.ComplianceStatus
@@ -340,14 +362,17 @@ class SourceControlConfiguration(ProxyResource):
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
+        'system_data': {'key': 'systemData', 'type': 'SystemData'},
         'repository_url': {'key': 'properties.repositoryUrl', 'type': 'str'},
         'operator_namespace': {'key': 'properties.operatorNamespace', 'type': 'str'},
         'operator_instance_name': {'key': 'properties.operatorInstanceName', 'type': 'str'},
         'operator_type': {'key': 'properties.operatorType', 'type': 'str'},
         'operator_params': {'key': 'properties.operatorParams', 'type': 'str'},
+        'configuration_protected_settings': {'key': 'properties.configurationProtectedSettings', 'type': '{str}'},
         'operator_scope': {'key': 'properties.operatorScope', 'type': 'str'},
         'repository_public_key': {'key': 'properties.repositoryPublicKey', 'type': 'str'},
-        'enable_helm_operator': {'key': 'properties.enableHelmOperator', 'type': 'str'},
+        'ssh_known_hosts_contents': {'key': 'properties.sshKnownHostsContents', 'type': 'str'},
+        'enable_helm_operator': {'key': 'properties.enableHelmOperator', 'type': 'bool'},
         'helm_operator_properties': {'key': 'properties.helmOperatorProperties', 'type': 'HelmOperatorProperties'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'compliance_status': {'key': 'properties.complianceStatus', 'type': 'ComplianceStatus'},
@@ -360,9 +385,64 @@ def __init__(self, **kwargs):
         self.operator_instance_name = kwargs.get('operator_instance_name', None)
         self.operator_type = kwargs.get('operator_type', None)
         self.operator_params = kwargs.get('operator_params', None)
+        self.configuration_protected_settings = kwargs.get('configuration_protected_settings', None)
         self.operator_scope = kwargs.get('operator_scope', "cluster")
         self.repository_public_key = None
+        self.ssh_known_hosts_contents = kwargs.get('ssh_known_hosts_contents', None)
         self.enable_helm_operator = kwargs.get('enable_helm_operator', None)
         self.helm_operator_properties = kwargs.get('helm_operator_properties', None)
         self.provisioning_state = None
         self.compliance_status = None
+
+
+class SystemData(Model):
+    """Top level metadata
+    https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar created_by: A string identifier for the identity that created the
+     resource
+    :vartype created_by: str
+    :ivar created_by_type: The type of identity that created the resource:
+     user, application, managedIdentity, key
+    :vartype created_by_type: str
+    :ivar created_at: The timestamp of resource creation (UTC)
+    :vartype created_at: datetime
+    :ivar last_modified_by: A string identifier for the identity that last
+     modified the resource
+    :vartype last_modified_by: str
+    :ivar last_modified_by_type: The type of identity that last modified the
+     resource: user, application, managedIdentity, key
+    :vartype last_modified_by_type: str
+    :ivar last_modified_at: The timestamp of resource last modification (UTC)
+    :vartype last_modified_at: datetime
+    """
+
+    _validation = {
+        'created_by': {'readonly': True},
+        'created_by_type': {'readonly': True},
+        'created_at': {'readonly': True},
+        'last_modified_by': {'readonly': True},
+        'last_modified_by_type': {'readonly': True},
+        'last_modified_at': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'created_by': {'key': 'createdBy', 'type': 'str'},
+        'created_by_type': {'key': 'createdByType', 'type': 'str'},
+        'created_at': {'key': 'createdAt', 'type': 'iso-8601'},
+        'last_modified_by': {'key': 'lastModifiedBy', 'type': 'str'},
+        'last_modified_by_type': {'key': 'lastModifiedByType', 'type': 'str'},
+        'last_modified_at': {'key': 'lastModifiedAt', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SystemData, self).__init__(**kwargs)
+        self.created_by = None
+        self.created_by_type = None
+        self.created_at = None
+        self.last_modified_by = None
+        self.last_modified_by_type = None
+        self.last_modified_at = None