[AutoPR] containerregistry/resource-manager (#3467)

* Generated from 13f78c9f9be8ff71afffbe76b21c7b0687b70ea8 (#3452)

Add ContextPath and source location URL for encode task and run type, add support for pull request based trigger.

* Generated from 7d58dd0e73fb2740d7ebe8e534a973e959395d68 (#3477)

allow specifying credentials for source registry on import image

* [AutoPR containerregistry/resource-manager] [ACR] Auto Build Swagger: Added identity to registry properties (#3491)

* Generated from a9ff5f330e569cbbdfded62d6506e9fe2b71f9ae

Added identity to registry properties

* Generated from 454d0e161ff250d2b0d4301d8375d74487249f30

CR comments

* Generated from 185e2e930d7cd67eb43fee8264dd52b805f87ec0

CR comments

* Generated from 185e2e930d7cd67eb43fee8264dd52b805f87ec0

CR comments

* [AutoPR containerregistry/resource-manager] Xiadu/msi (#3580)

* Generated from 9a9e5ed8ac100538a6ceaff6c0a24b16ad2c0e26

remove the identity properties

* Generated from f3b3520c32cfe447a5f85b6491d65d59855b440a

remove the identity properties

* Packaging update of azure-mgmt-containerregistry

* ACR 2.3.0

azure-mgmt-containerregistry/HISTORY.rst

@@ -3,6 +3,12 @@
 Release History
 ===============
 
+2.3.0 (2018-10-17)
+++++++++++++++++++
+
+- Support context path, source location URL, and pull request based triggers for task/run.
+- Allow specifying credentials for source registry on import image.
+
 2.2.0 (2018-09-11)
 ++++++++++++++++++
 

azure-mgmt-containerregistry/MANIFEST.in

@@ -1 +1,4 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/__init__.py

@@ -10,6 +10,7 @@
 # --------------------------------------------------------------------------
 
 try:
+    from .import_source_credentials_py3 import ImportSourceCredentials
     from .import_source_py3 import ImportSource
     from .import_image_parameters_py3 import ImportImageParameters
     from .registry_name_check_request_py3 import RegistryNameCheckRequest
@@ -48,6 +49,7 @@
     from .event_py3 import Event
     from .resource_py3 import Resource
 except (SyntaxError, ImportError):
+    from .import_source_credentials import ImportSourceCredentials
     from .import_source import ImportSource
     from .import_image_parameters import ImportImageParameters
     from .registry_name_check_request import RegistryNameCheckRequest
@@ -104,6 +106,7 @@
 )
 
 __all__ = [
+    'ImportSourceCredentials',
     'ImportSource',
     'ImportImageParameters',
     'RegistryNameCheckRequest',

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source.py

@@ -20,8 +20,12 @@ class ImportSource(Model):
     :param resource_id: The resource identifier of the source Azure Container
      Registry.
     :type resource_id: str
-    :param registry_uri: The address of the source registry.
+    :param registry_uri: The address of the source registry (e.g.
+     'mcr.microsoft.com').
     :type registry_uri: str
+    :param credentials: Credentials used when importing from a registry uri.
+    :type credentials:
+     ~azure.mgmt.containerregistry.v2017_10_01.models.ImportSourceCredentials
     :param source_image: Required. Repository name of the source image.
      Specify an image by repository ('hello-world'). This will use the 'latest'
      tag.
@@ -38,11 +42,13 @@ class ImportSource(Model):
     _attribute_map = {
         'resource_id': {'key': 'resourceId', 'type': 'str'},
         'registry_uri': {'key': 'registryUri', 'type': 'str'},
+        'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'},
         'source_image': {'key': 'sourceImage', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(ImportSource, self).__init__(**kwargs)
         self.resource_id = kwargs.get('resource_id', None)
         self.registry_uri = kwargs.get('registry_uri', None)
+        self.credentials = kwargs.get('credentials', None)
         self.source_image = kwargs.get('source_image', None)

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials.py

@@ -0,0 +1,39 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ImportSourceCredentials(Model):
+    """ImportSourceCredentials.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param username: The username to authenticate with the source registry.
+    :type username: str
+    :param password: Required. The password used to authenticate with the
+     source registry.
+    :type password: str
+    """
+
+    _validation = {
+        'password': {'required': True},
+    }
+
+    _attribute_map = {
+        'username': {'key': 'username', 'type': 'str'},
+        'password': {'key': 'password', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImportSourceCredentials, self).__init__(**kwargs)
+        self.username = kwargs.get('username', None)
+        self.password = kwargs.get('password', None)

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_credentials_py3.py

@@ -0,0 +1,39 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ImportSourceCredentials(Model):
+    """ImportSourceCredentials.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param username: The username to authenticate with the source registry.
+    :type username: str
+    :param password: Required. The password used to authenticate with the
+     source registry.
+    :type password: str
+    """
+
+    _validation = {
+        'password': {'required': True},
+    }
+
+    _attribute_map = {
+        'username': {'key': 'username', 'type': 'str'},
+        'password': {'key': 'password', 'type': 'str'},
+    }
+
+    def __init__(self, *, password: str, username: str=None, **kwargs) -> None:
+        super(ImportSourceCredentials, self).__init__(**kwargs)
+        self.username = username
+        self.password = password

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2017_10_01/models/import_source_py3.py

@@ -20,8 +20,12 @@ class ImportSource(Model):
     :param resource_id: The resource identifier of the source Azure Container
      Registry.
     :type resource_id: str
-    :param registry_uri: The address of the source registry.
+    :param registry_uri: The address of the source registry (e.g.
+     'mcr.microsoft.com').
     :type registry_uri: str
+    :param credentials: Credentials used when importing from a registry uri.
+    :type credentials:
+     ~azure.mgmt.containerregistry.v2017_10_01.models.ImportSourceCredentials
     :param source_image: Required. Repository name of the source image.
      Specify an image by repository ('hello-world'). This will use the 'latest'
      tag.
@@ -38,11 +42,13 @@ class ImportSource(Model):
     _attribute_map = {
         'resource_id': {'key': 'resourceId', 'type': 'str'},
         'registry_uri': {'key': 'registryUri', 'type': 'str'},
+        'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'},
         'source_image': {'key': 'sourceImage', 'type': 'str'},
     }
 
-    def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, **kwargs) -> None:
+    def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, credentials=None, **kwargs) -> None:
         super(ImportSource, self).__init__(**kwargs)
         self.resource_id = resource_id
         self.registry_uri = registry_uri
+        self.credentials = credentials
         self.source_image = source_image

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/__init__.py

@@ -10,6 +10,7 @@
 # --------------------------------------------------------------------------
 
 try:
+    from .import_source_credentials_py3 import ImportSourceCredentials
     from .import_source_py3 import ImportSource
     from .import_image_parameters_py3 import ImportImageParameters
     from .registry_name_check_request_py3 import RegistryNameCheckRequest
@@ -75,6 +76,7 @@
     from .build_task_build_request_py3 import BuildTaskBuildRequest
     from .quick_build_request_py3 import QuickBuildRequest
 except (SyntaxError, ImportError):
+    from .import_source_credentials import ImportSourceCredentials
     from .import_source import ImportSource
     from .import_image_parameters import ImportImageParameters
     from .registry_name_check_request import RegistryNameCheckRequest
@@ -170,6 +172,7 @@
 )
 
 __all__ = [
+    'ImportSourceCredentials',
     'ImportSource',
     'ImportImageParameters',
     'RegistryNameCheckRequest',

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source.py

@@ -20,8 +20,12 @@ class ImportSource(Model):
     :param resource_id: The resource identifier of the source Azure Container
      Registry.
     :type resource_id: str
-    :param registry_uri: The address of the source registry.
+    :param registry_uri: The address of the source registry (e.g.
+     'mcr.microsoft.com').
     :type registry_uri: str
+    :param credentials: Credentials used when importing from a registry uri.
+    :type credentials:
+     ~azure.mgmt.containerregistry.v2018_02_01_preview.models.ImportSourceCredentials
     :param source_image: Required. Repository name of the source image.
      Specify an image by repository ('hello-world'). This will use the 'latest'
      tag.
@@ -38,11 +42,13 @@ class ImportSource(Model):
     _attribute_map = {
         'resource_id': {'key': 'resourceId', 'type': 'str'},
         'registry_uri': {'key': 'registryUri', 'type': 'str'},
+        'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'},
         'source_image': {'key': 'sourceImage', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(ImportSource, self).__init__(**kwargs)
         self.resource_id = kwargs.get('resource_id', None)
         self.registry_uri = kwargs.get('registry_uri', None)
+        self.credentials = kwargs.get('credentials', None)
         self.source_image = kwargs.get('source_image', None)

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials.py

@@ -0,0 +1,39 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ImportSourceCredentials(Model):
+    """ImportSourceCredentials.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param username: The username to authenticate with the source registry.
+    :type username: str
+    :param password: Required. The password used to authenticate with the
+     source registry.
+    :type password: str
+    """
+
+    _validation = {
+        'password': {'required': True},
+    }
+
+    _attribute_map = {
+        'username': {'key': 'username', 'type': 'str'},
+        'password': {'key': 'password', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImportSourceCredentials, self).__init__(**kwargs)
+        self.username = kwargs.get('username', None)
+        self.password = kwargs.get('password', None)

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_credentials_py3.py

@@ -0,0 +1,39 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ImportSourceCredentials(Model):
+    """ImportSourceCredentials.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param username: The username to authenticate with the source registry.
+    :type username: str
+    :param password: Required. The password used to authenticate with the
+     source registry.
+    :type password: str
+    """
+
+    _validation = {
+        'password': {'required': True},
+    }
+
+    _attribute_map = {
+        'username': {'key': 'username', 'type': 'str'},
+        'password': {'key': 'password', 'type': 'str'},
+    }
+
+    def __init__(self, *, password: str, username: str=None, **kwargs) -> None:
+        super(ImportSourceCredentials, self).__init__(**kwargs)
+        self.username = username
+        self.password = password

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_02_01_preview/models/import_source_py3.py

@@ -20,8 +20,12 @@ class ImportSource(Model):
     :param resource_id: The resource identifier of the source Azure Container
      Registry.
     :type resource_id: str
-    :param registry_uri: The address of the source registry.
+    :param registry_uri: The address of the source registry (e.g.
+     'mcr.microsoft.com').
     :type registry_uri: str
+    :param credentials: Credentials used when importing from a registry uri.
+    :type credentials:
+     ~azure.mgmt.containerregistry.v2018_02_01_preview.models.ImportSourceCredentials
     :param source_image: Required. Repository name of the source image.
      Specify an image by repository ('hello-world'). This will use the 'latest'
      tag.
@@ -38,11 +42,13 @@ class ImportSource(Model):
     _attribute_map = {
         'resource_id': {'key': 'resourceId', 'type': 'str'},
         'registry_uri': {'key': 'registryUri', 'type': 'str'},
+        'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'},
         'source_image': {'key': 'sourceImage', 'type': 'str'},
     }
 
-    def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, **kwargs) -> None:
+    def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, credentials=None, **kwargs) -> None:
         super(ImportSource, self).__init__(**kwargs)
         self.resource_id = resource_id
         self.registry_uri = registry_uri
+        self.credentials = credentials
         self.source_image = source_image

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/__init__.py

@@ -10,6 +10,7 @@
 # --------------------------------------------------------------------------
 
 try:
+    from .import_source_credentials_py3 import ImportSourceCredentials
     from .import_source_py3 import ImportSource
     from .import_image_parameters_py3 import ImportImageParameters
     from .registry_name_check_request_py3 import RegistryNameCheckRequest
@@ -88,6 +89,7 @@
     from .file_task_step_update_parameters_py3 import FileTaskStepUpdateParameters
     from .encoded_task_step_update_parameters_py3 import EncodedTaskStepUpdateParameters
 except (SyntaxError, ImportError):
+    from .import_source_credentials import ImportSourceCredentials
     from .import_source import ImportSource
     from .import_image_parameters import ImportImageParameters
     from .registry_name_check_request import RegistryNameCheckRequest
@@ -198,6 +200,7 @@
 )
 
 __all__ = [
+    'ImportSourceCredentials',
     'ImportSource',
     'ImportImageParameters',
     'RegistryNameCheckRequest',

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/base_image_trigger.py

@@ -21,8 +21,8 @@ class BaseImageTrigger(Model):
      base image dependency updates. Possible values include: 'All', 'Runtime'
     :type base_image_trigger_type: str or
      ~azure.mgmt.containerregistry.v2018_09_01.models.BaseImageTriggerType
-    :param status: The current status of build trigger. Possible values
-     include: 'Disabled', 'Enabled'
+    :param status: The current status of trigger. Possible values include:
+     'Disabled', 'Enabled'
     :type status: str or
      ~azure.mgmt.containerregistry.v2018_09_01.models.TriggerStatus
     :param name: Required. The name of the trigger.

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/base_image_trigger_py3.py

@@ -21,8 +21,8 @@ class BaseImageTrigger(Model):
      base image dependency updates. Possible values include: 'All', 'Runtime'
     :type base_image_trigger_type: str or
      ~azure.mgmt.containerregistry.v2018_09_01.models.BaseImageTriggerType
-    :param status: The current status of build trigger. Possible values
-     include: 'Disabled', 'Enabled'
+    :param status: The current status of trigger. Possible values include:
+     'Disabled', 'Enabled'
     :type status: str or
      ~azure.mgmt.containerregistry.v2018_09_01.models.TriggerStatus
     :param name: Required. The name of the trigger.

azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2018_09_01/models/base_image_trigger_update_parameters.py

@@ -21,8 +21,8 @@ class BaseImageTriggerUpdateParameters(Model):
      image dependency updates. Possible values include: 'All', 'Runtime'
     :type base_image_trigger_type: str or
      ~azure.mgmt.containerregistry.v2018_09_01.models.BaseImageTriggerType
-    :param status: The current status of build trigger. Possible values
-     include: 'Disabled', 'Enabled'
+    :param status: The current status of trigger. Possible values include:
+     'Disabled', 'Enabled'
     :type status: str or
      ~azure.mgmt.containerregistry.v2018_09_01.models.TriggerStatus
     :param name: Required. The name of the trigger.