Skip to content

Commit afc2be4

Browse files
AutorestCIlmazuel
authored andcommitted
[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
1 parent 11439f2 commit afc2be4

File tree

57 files changed

+480
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+480
-171
lines changed

azure-mgmt-containerregistry/HISTORY.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
Release History
44
===============
55

6+
2.3.0 (2018-10-17)
7+
++++++++++++++++++
8+
9+
- Support context path, source location URL, and pull request based triggers for task/run.
10+
- Allow specifying credentials for source registry on import image.
11+
612
2.2.0 (2018-09-11)
713
++++++++++++++++++
814

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
include *.rst
2+
include azure/__init__.py
3+
include azure/mgmt/__init__.py
4+

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13+
from .import_source_credentials_py3 import ImportSourceCredentials
1314
from .import_source_py3 import ImportSource
1415
from .import_image_parameters_py3 import ImportImageParameters
1516
from .registry_name_check_request_py3 import RegistryNameCheckRequest
@@ -48,6 +49,7 @@
4849
from .event_py3 import Event
4950
from .resource_py3 import Resource
5051
except (SyntaxError, ImportError):
52+
from .import_source_credentials import ImportSourceCredentials
5153
from .import_source import ImportSource
5254
from .import_image_parameters import ImportImageParameters
5355
from .registry_name_check_request import RegistryNameCheckRequest
@@ -104,6 +106,7 @@
104106
)
105107

106108
__all__ = [
109+
'ImportSourceCredentials',
107110
'ImportSource',
108111
'ImportImageParameters',
109112
'RegistryNameCheckRequest',

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ class ImportSource(Model):
2020
:param resource_id: The resource identifier of the source Azure Container
2121
Registry.
2222
:type resource_id: str
23-
:param registry_uri: The address of the source registry.
23+
:param registry_uri: The address of the source registry (e.g.
24+
'mcr.microsoft.com').
2425
:type registry_uri: str
26+
:param credentials: Credentials used when importing from a registry uri.
27+
:type credentials:
28+
~azure.mgmt.containerregistry.v2017_10_01.models.ImportSourceCredentials
2529
:param source_image: Required. Repository name of the source image.
2630
Specify an image by repository ('hello-world'). This will use the 'latest'
2731
tag.
@@ -38,11 +42,13 @@ class ImportSource(Model):
3842
_attribute_map = {
3943
'resource_id': {'key': 'resourceId', 'type': 'str'},
4044
'registry_uri': {'key': 'registryUri', 'type': 'str'},
45+
'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'},
4146
'source_image': {'key': 'sourceImage', 'type': 'str'},
4247
}
4348

4449
def __init__(self, **kwargs):
4550
super(ImportSource, self).__init__(**kwargs)
4651
self.resource_id = kwargs.get('resource_id', None)
4752
self.registry_uri = kwargs.get('registry_uri', None)
53+
self.credentials = kwargs.get('credentials', None)
4854
self.source_image = kwargs.get('source_image', None)
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from msrest.serialization import Model
13+
14+
15+
class ImportSourceCredentials(Model):
16+
"""ImportSourceCredentials.
17+
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param username: The username to authenticate with the source registry.
21+
:type username: str
22+
:param password: Required. The password used to authenticate with the
23+
source registry.
24+
:type password: str
25+
"""
26+
27+
_validation = {
28+
'password': {'required': True},
29+
}
30+
31+
_attribute_map = {
32+
'username': {'key': 'username', 'type': 'str'},
33+
'password': {'key': 'password', 'type': 'str'},
34+
}
35+
36+
def __init__(self, **kwargs):
37+
super(ImportSourceCredentials, self).__init__(**kwargs)
38+
self.username = kwargs.get('username', None)
39+
self.password = kwargs.get('password', None)
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from msrest.serialization import Model
13+
14+
15+
class ImportSourceCredentials(Model):
16+
"""ImportSourceCredentials.
17+
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param username: The username to authenticate with the source registry.
21+
:type username: str
22+
:param password: Required. The password used to authenticate with the
23+
source registry.
24+
:type password: str
25+
"""
26+
27+
_validation = {
28+
'password': {'required': True},
29+
}
30+
31+
_attribute_map = {
32+
'username': {'key': 'username', 'type': 'str'},
33+
'password': {'key': 'password', 'type': 'str'},
34+
}
35+
36+
def __init__(self, *, password: str, username: str=None, **kwargs) -> None:
37+
super(ImportSourceCredentials, self).__init__(**kwargs)
38+
self.username = username
39+
self.password = password

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ class ImportSource(Model):
2020
:param resource_id: The resource identifier of the source Azure Container
2121
Registry.
2222
:type resource_id: str
23-
:param registry_uri: The address of the source registry.
23+
:param registry_uri: The address of the source registry (e.g.
24+
'mcr.microsoft.com').
2425
:type registry_uri: str
26+
:param credentials: Credentials used when importing from a registry uri.
27+
:type credentials:
28+
~azure.mgmt.containerregistry.v2017_10_01.models.ImportSourceCredentials
2529
:param source_image: Required. Repository name of the source image.
2630
Specify an image by repository ('hello-world'). This will use the 'latest'
2731
tag.
@@ -38,11 +42,13 @@ class ImportSource(Model):
3842
_attribute_map = {
3943
'resource_id': {'key': 'resourceId', 'type': 'str'},
4044
'registry_uri': {'key': 'registryUri', 'type': 'str'},
45+
'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'},
4146
'source_image': {'key': 'sourceImage', 'type': 'str'},
4247
}
4348

44-
def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, **kwargs) -> None:
49+
def __init__(self, *, source_image: str, resource_id: str=None, registry_uri: str=None, credentials=None, **kwargs) -> None:
4550
super(ImportSource, self).__init__(**kwargs)
4651
self.resource_id = resource_id
4752
self.registry_uri = registry_uri
53+
self.credentials = credentials
4854
self.source_image = source_image

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13+
from .import_source_credentials_py3 import ImportSourceCredentials
1314
from .import_source_py3 import ImportSource
1415
from .import_image_parameters_py3 import ImportImageParameters
1516
from .registry_name_check_request_py3 import RegistryNameCheckRequest
@@ -75,6 +76,7 @@
7576
from .build_task_build_request_py3 import BuildTaskBuildRequest
7677
from .quick_build_request_py3 import QuickBuildRequest
7778
except (SyntaxError, ImportError):
79+
from .import_source_credentials import ImportSourceCredentials
7880
from .import_source import ImportSource
7981
from .import_image_parameters import ImportImageParameters
8082
from .registry_name_check_request import RegistryNameCheckRequest
@@ -170,6 +172,7 @@
170172
)
171173

172174
__all__ = [
175+
'ImportSourceCredentials',
173176
'ImportSource',
174177
'ImportImageParameters',
175178
'RegistryNameCheckRequest',

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ class ImportSource(Model):
2020
:param resource_id: The resource identifier of the source Azure Container
2121
Registry.
2222
:type resource_id: str
23-
:param registry_uri: The address of the source registry.
23+
:param registry_uri: The address of the source registry (e.g.
24+
'mcr.microsoft.com').
2425
:type registry_uri: str
26+
:param credentials: Credentials used when importing from a registry uri.
27+
:type credentials:
28+
~azure.mgmt.containerregistry.v2018_02_01_preview.models.ImportSourceCredentials
2529
:param source_image: Required. Repository name of the source image.
2630
Specify an image by repository ('hello-world'). This will use the 'latest'
2731
tag.
@@ -38,11 +42,13 @@ class ImportSource(Model):
3842
_attribute_map = {
3943
'resource_id': {'key': 'resourceId', 'type': 'str'},
4044
'registry_uri': {'key': 'registryUri', 'type': 'str'},
45+
'credentials': {'key': 'credentials', 'type': 'ImportSourceCredentials'},
4146
'source_image': {'key': 'sourceImage', 'type': 'str'},
4247
}
4348

4449
def __init__(self, **kwargs):
4550
super(ImportSource, self).__init__(**kwargs)
4651
self.resource_id = kwargs.get('resource_id', None)
4752
self.registry_uri = kwargs.get('registry_uri', None)
53+
self.credentials = kwargs.get('credentials', None)
4854
self.source_image = kwargs.get('source_image', None)
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from msrest.serialization import Model
13+
14+
15+
class ImportSourceCredentials(Model):
16+
"""ImportSourceCredentials.
17+
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param username: The username to authenticate with the source registry.
21+
:type username: str
22+
:param password: Required. The password used to authenticate with the
23+
source registry.
24+
:type password: str
25+
"""
26+
27+
_validation = {
28+
'password': {'required': True},
29+
}
30+
31+
_attribute_map = {
32+
'username': {'key': 'username', 'type': 'str'},
33+
'password': {'key': 'password', 'type': 'str'},
34+
}
35+
36+
def __init__(self, **kwargs):
37+
super(ImportSourceCredentials, self).__init__(**kwargs)
38+
self.username = kwargs.get('username', None)
39+
self.password = kwargs.get('password', None)

0 commit comments

Comments
 (0)