Skip to content

Commit 3a19e3d

Browse files
xiangyan99azure-sdkdanieljurekbryevdvYijunXieMS
authored
Get latest master (#11371)
* Increment package version after release of azure_ai_formrecognizer (#11280) * move smoke-test.yml to enable failure notification (#11261) * use new subclients (#11296) * [Event Hubs] Workaround pylint unused-import false positive (#11322) * Containerregistry release 2019 12 01 (#11268) * Generated from c0e334513038787686fe5db7729455ac0a8360f5 update examples for pipeline run * release containerregister 2019-12-01 * update version Co-authored-by: SDK Automation <[email protected]> * Test sqlvirtualmachine (#11329) * test for sqlvirtualmachine * added some stuff * added necessary prerequisites * more sql vm tests * moved group creation * more test changes * creating storage * a few changes * fixes * completed test * fake storage key * moved tests to the right location * Packaging update of azure-mgmt-sqlvirtualmachine * updated coverage Co-authored-by: Azure SDK Bot <[email protected]> * Resolve Smoke-Test Issue (#11340) * pin pip version to resolve issue with internal updates to pip * Publish GA packages to dev feed (#11341) * Publish packages to dev feed * Promote job variable to pipeline parameter * release-for-mgmt-storage (#11018) Co-authored-by: Azure SDK Bot <[email protected]> Co-authored-by: Daniel Jurek <[email protected]> Co-authored-by: Bryan Van de Ven <[email protected]> Co-authored-by: Yijun Xie <[email protected]> Co-authored-by: chunyu3 <[email protected]> Co-authored-by: SDK Automation <[email protected]> Co-authored-by: Zim Kalinowski <[email protected]> Co-authored-by: Azure SDK Bot <[email protected]> Co-authored-by: Scott Beddall <[email protected]> Co-authored-by: Chidozie Ononiwu <[email protected]> Co-authored-by: Qiaoqiao Zhang <[email protected]>
1 parent 4a6bfcf commit 3a19e3d

File tree

57 files changed

+8022
-1335
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

+8022
-1335
lines changed

eng/pipelines/smoke-test.yml renamed to common/smoketest/smoke-test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ jobs:
7979
inputs:
8080
versionSpec: $(PythonVersion)
8181

82-
- script: pip --version
82+
- script: |
83+
python -m pip install pip==20.0.2
84+
pip --version
8385
displayName: pip --version
8486
8587
- script: pip install packaging pkginfo
@@ -95,7 +97,7 @@ jobs:
9597
- script: python ./eng/tox/install_dev_build_dependency.py -r ./common/smoketest/requirements.txt
9698
displayName: "Install dev dependencies from feed"
9799

98-
- template: ../common/TestResources/deploy-test-resources.yml
100+
- template: /eng/common/TestResources/deploy-test-resources.yml
99101
parameters:
100102
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoketest/'
101103
CloudType: $(CloudType)
@@ -105,6 +107,6 @@ jobs:
105107
- script: python ./common/smoketest/program.py
106108
displayName: "Run Smoke Test"
107109

108-
- template: ../common/TestResources/remove-test-resources.yml
110+
- template: /eng/common/TestResources/remove-test-resources.yml
109111
parameters:
110-
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoketest/'
112+
ServiceDirectory: '$(Build.SourcesDirectory)/common/smoketest/'

eng/pipelines/templates/stages/archetype-python-release.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ parameters:
33
ArtifactName: 'not-specified'
44
DependsOn: Build
55
DocArtifact: 'documentation'
6+
DevFeedName: public/azure-sdk-for-python
67

78
stages:
89
- ${{if and(eq(variables['Build.Reason'], 'Manual'), eq(variables['System.TeamProject'], 'internal'))}}:
@@ -82,6 +83,11 @@ stages:
8283
inputs:
8384
pythonUploadServiceConnection: 'pypi.org - azure-sdk'
8485

86+
- task: TwineAuthenticate@0
87+
displayName: 'Authenticate to feed: ${{parameters.DevFeedName}}'
88+
inputs:
89+
artifactFeeds: ${{parameters.DevFeedName}}
90+
8591
- script: |
8692
set -e
8793
twine upload --repository 'pypi' --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.whl
@@ -90,6 +96,14 @@ stages:
9096
echo "Uploaded zip to pypi"
9197
displayName: 'Publish package to registry: pypi.org'
9298
99+
- script: |
100+
set -e
101+
twine upload --repository ${{parameters.DevFeedName}} --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.whl
102+
echo "Uploaded whl to devops feed"
103+
twine upload --repository ${{parameters.DevFeedName}} --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.zip
104+
echo "Uploaded sdist to devops feed"
105+
displayName: 'Publish package to feed: ${{parameters.DevFeedName}}'
106+
93107
- ${{if ne(artifact.options.skipPublishDocs, 'true')}}:
94108
- deployment: PublishDocs
95109
displayName: Publish Docs to GitHubIO Blob Storage
@@ -161,8 +175,6 @@ stages:
161175
- job: PublishPackages
162176
displayName: "Publish package to daily feed"
163177
condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal')))
164-
variables:
165-
devFeedName: public/azure-sdk-for-python
166178
pool:
167179
vmImage: ubuntu-18.04
168180
steps:
@@ -177,9 +189,9 @@ stages:
177189
displayName: Install Twine
178190
179191
- task: TwineAuthenticate@0
180-
displayName: 'Authenticate to feed: $(devFeedName)'
192+
displayName: 'Authenticate to feed: ${{parameters.DevFeedName}}'
181193
inputs:
182-
artifactFeeds: $(devFeedName)
194+
artifactFeeds: ${{parameters.DevFeedName}}
183195

184196
- ${{ each artifact in parameters.Artifacts }}:
185197

@@ -196,9 +208,9 @@ stages:
196208
197209
- script: |
198210
set -e
199-
twine upload --repository $(devFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.whl
211+
twine upload --repository ${{parameters.DevFeedName}} --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.whl
200212
echo "Uploaded whl to devops feed"
201-
twine upload --repository $(devFeedName) --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.zip
213+
twine upload --repository ${{parameters.DevFeedName}} --config-file $(PYPIRC_PATH) $(Pipeline.Workspace)/${{artifact.safeName}}/*.dev*.zip
202214
echo "Uploaded sdist to devops feed"
203-
displayName: 'Publish package to feed: $(devFeedName)'
215+
displayName: 'Publish package to feed: ${{parameters.DevFeedName}}'
204216
condition: gt(variables['FilesToUploadCount'], 0)

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Release History
22

3+
## 3.0.0rc12(2020-05-06)
4+
5+
**Features**
6+
7+
- Model Registry has a new parameter public_network_access
8+
- Model ErrorResponseBody has a new parameter details
9+
- Model ErrorResponseBody has a new parameter target
10+
- Model RegistryUpdateParameters has a new parameter public_network_access
11+
- Added operation group PipelineRunsOperations
12+
- Added operation group ImportPipelinesOperations
13+
- Added operation group ExportPipelinesOperations
14+
315
## 3.0.0rc11 (2020-03-25)
416

517
**Breaking changes**

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/_container_registry_management_client.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,32 @@ def builds(self):
169169
raise NotImplementedError("APIVersion {} is not available".format(api_version))
170170
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
171171

172+
@property
173+
def export_pipelines(self):
174+
"""Instance depends on the API version:
175+
176+
* 2019-12-01-preview: :class:`ExportPipelinesOperations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.ExportPipelinesOperations>`
177+
"""
178+
api_version = self._get_api_version('export_pipelines')
179+
if api_version == '2019-12-01-preview':
180+
from .v2019_12_01_preview.operations import ExportPipelinesOperations as OperationClass
181+
else:
182+
raise NotImplementedError("APIVersion {} is not available".format(api_version))
183+
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
184+
185+
@property
186+
def import_pipelines(self):
187+
"""Instance depends on the API version:
188+
189+
* 2019-12-01-preview: :class:`ImportPipelinesOperations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.ImportPipelinesOperations>`
190+
"""
191+
api_version = self._get_api_version('import_pipelines')
192+
if api_version == '2019-12-01-preview':
193+
from .v2019_12_01_preview.operations import ImportPipelinesOperations as OperationClass
194+
else:
195+
raise NotImplementedError("APIVersion {} is not available".format(api_version))
196+
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
197+
172198
@property
173199
def operations(self):
174200
"""Instance depends on the API version:
@@ -206,6 +232,19 @@ def operations(self):
206232
raise NotImplementedError("APIVersion {} is not available".format(api_version))
207233
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
208234

235+
@property
236+
def pipeline_runs(self):
237+
"""Instance depends on the API version:
238+
239+
* 2019-12-01-preview: :class:`PipelineRunsOperations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.PipelineRunsOperations>`
240+
"""
241+
api_version = self._get_api_version('pipeline_runs')
242+
if api_version == '2019-12-01-preview':
243+
from .v2019_12_01_preview.operations import PipelineRunsOperations as OperationClass
244+
else:
245+
raise NotImplementedError("APIVersion {} is not available".format(api_version))
246+
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
247+
209248
@property
210249
def private_endpoint_connections(self):
211250
"""Instance depends on the API version:

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
from ._models_py3 import ImportImageParameters
5050
from ._models_py3 import ImportSource
5151
from ._models_py3 import ImportSourceCredentials
52+
from ._models_py3 import InnerErrorDescription
5253
from ._models_py3 import IPRule
5354
from ._models_py3 import NetworkRuleSet
5455
from ._models_py3 import OperationDefinition
@@ -159,6 +160,7 @@
159160
from ._models import ImportImageParameters
160161
from ._models import ImportSource
161162
from ._models import ImportSourceCredentials
163+
from ._models import InnerErrorDescription
162164
from ._models import IPRule
163165
from ._models import NetworkRuleSet
164166
from ._models import OperationDefinition
@@ -314,6 +316,7 @@
314316
'ImportImageParameters',
315317
'ImportSource',
316318
'ImportSourceCredentials',
319+
'InnerErrorDescription',
317320
'IPRule',
318321
'NetworkRuleSet',
319322
'OperationDefinition',

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/_models.py

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,12 @@ class ErrorResponseBody(Model):
11181118
:type code: str
11191119
:param message: Required. error message.
11201120
:type message: str
1121+
:param target: target of the particular error.
1122+
:type target: str
1123+
:param details: an array of additional nested error response info objects,
1124+
as described by this contract.
1125+
:type details:
1126+
~azure.mgmt.containerregistry.v2019_06_01_preview.models.InnerErrorDescription
11211127
"""
11221128

11231129
_validation = {
@@ -1128,12 +1134,16 @@ class ErrorResponseBody(Model):
11281134
_attribute_map = {
11291135
'code': {'key': 'code', 'type': 'str'},
11301136
'message': {'key': 'message', 'type': 'str'},
1137+
'target': {'key': 'target', 'type': 'str'},
1138+
'details': {'key': 'details', 'type': 'InnerErrorDescription'},
11311139
}
11321140

11331141
def __init__(self, **kwargs):
11341142
super(ErrorResponseBody, self).__init__(**kwargs)
11351143
self.code = kwargs.get('code', None)
11361144
self.message = kwargs.get('message', None)
1145+
self.target = kwargs.get('target', None)
1146+
self.details = kwargs.get('details', None)
11371147

11381148

11391149
class EventInfo(Model):
@@ -1717,6 +1727,37 @@ def __init__(self, **kwargs):
17171727
self.password = kwargs.get('password', None)
17181728

17191729

1730+
class InnerErrorDescription(Model):
1731+
"""inner error.
1732+
1733+
All required parameters must be populated in order to send to Azure.
1734+
1735+
:param code: Required. error code.
1736+
:type code: str
1737+
:param message: Required. error message.
1738+
:type message: str
1739+
:param target: target of the particular error.
1740+
:type target: str
1741+
"""
1742+
1743+
_validation = {
1744+
'code': {'required': True},
1745+
'message': {'required': True},
1746+
}
1747+
1748+
_attribute_map = {
1749+
'code': {'key': 'code', 'type': 'str'},
1750+
'message': {'key': 'message', 'type': 'str'},
1751+
'target': {'key': 'target', 'type': 'str'},
1752+
}
1753+
1754+
def __init__(self, **kwargs):
1755+
super(InnerErrorDescription, self).__init__(**kwargs)
1756+
self.code = kwargs.get('code', None)
1757+
self.message = kwargs.get('message', None)
1758+
self.target = kwargs.get('target', None)
1759+
1760+
17201761
class IPRule(Model):
17211762
"""IP rule with specific IP or IP range in CIDR format.
17221763

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/_models_py3.py

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,12 @@ class ErrorResponseBody(Model):
11181118
:type code: str
11191119
:param message: Required. error message.
11201120
:type message: str
1121+
:param target: target of the particular error.
1122+
:type target: str
1123+
:param details: an array of additional nested error response info objects,
1124+
as described by this contract.
1125+
:type details:
1126+
~azure.mgmt.containerregistry.v2019_06_01_preview.models.InnerErrorDescription
11211127
"""
11221128

11231129
_validation = {
@@ -1128,12 +1134,16 @@ class ErrorResponseBody(Model):
11281134
_attribute_map = {
11291135
'code': {'key': 'code', 'type': 'str'},
11301136
'message': {'key': 'message', 'type': 'str'},
1137+
'target': {'key': 'target', 'type': 'str'},
1138+
'details': {'key': 'details', 'type': 'InnerErrorDescription'},
11311139
}
11321140

1133-
def __init__(self, *, code: str, message: str, **kwargs) -> None:
1141+
def __init__(self, *, code: str, message: str, target: str=None, details=None, **kwargs) -> None:
11341142
super(ErrorResponseBody, self).__init__(**kwargs)
11351143
self.code = code
11361144
self.message = message
1145+
self.target = target
1146+
self.details = details
11371147

11381148

11391149
class EventInfo(Model):
@@ -1717,6 +1727,37 @@ def __init__(self, *, password: str, username: str=None, **kwargs) -> None:
17171727
self.password = password
17181728

17191729

1730+
class InnerErrorDescription(Model):
1731+
"""inner error.
1732+
1733+
All required parameters must be populated in order to send to Azure.
1734+
1735+
:param code: Required. error code.
1736+
:type code: str
1737+
:param message: Required. error message.
1738+
:type message: str
1739+
:param target: target of the particular error.
1740+
:type target: str
1741+
"""
1742+
1743+
_validation = {
1744+
'code': {'required': True},
1745+
'message': {'required': True},
1746+
}
1747+
1748+
_attribute_map = {
1749+
'code': {'key': 'code', 'type': 'str'},
1750+
'message': {'key': 'message', 'type': 'str'},
1751+
'target': {'key': 'target', 'type': 'str'},
1752+
}
1753+
1754+
def __init__(self, *, code: str, message: str, target: str=None, **kwargs) -> None:
1755+
super(InnerErrorDescription, self).__init__(**kwargs)
1756+
self.code = code
1757+
self.message = message
1758+
self.target = target
1759+
1760+
17201761
class IPRule(Model):
17211762
"""IP rule with specific IP or IP range in CIDR format.
17221763

sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_12_01_preview/_container_registry_management_client.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
from msrest import Serializer, Deserializer
1414

1515
from ._configuration import ContainerRegistryManagementClientConfiguration
16+
from .operations import ExportPipelinesOperations
1617
from .operations import RegistriesOperations
18+
from .operations import ImportPipelinesOperations
1719
from .operations import Operations
20+
from .operations import PipelineRunsOperations
1821
from .operations import PrivateEndpointConnectionsOperations
1922
from .operations import ReplicationsOperations
2023
from .operations import WebhooksOperations
@@ -33,10 +36,16 @@ class ContainerRegistryManagementClient(SDKClient):
3336
:ivar config: Configuration for client.
3437
:vartype config: ContainerRegistryManagementClientConfiguration
3538
39+
:ivar export_pipelines: ExportPipelines operations
40+
:vartype export_pipelines: azure.mgmt.containerregistry.v2019_12_01_preview.operations.ExportPipelinesOperations
3641
:ivar registries: Registries operations
3742
:vartype registries: azure.mgmt.containerregistry.v2019_12_01_preview.operations.RegistriesOperations
43+
:ivar import_pipelines: ImportPipelines operations
44+
:vartype import_pipelines: azure.mgmt.containerregistry.v2019_12_01_preview.operations.ImportPipelinesOperations
3845
:ivar operations: Operations operations
3946
:vartype operations: azure.mgmt.containerregistry.v2019_12_01_preview.operations.Operations
47+
:ivar pipeline_runs: PipelineRuns operations
48+
:vartype pipeline_runs: azure.mgmt.containerregistry.v2019_12_01_preview.operations.PipelineRunsOperations
4049
:ivar private_endpoint_connections: PrivateEndpointConnections operations
4150
:vartype private_endpoint_connections: azure.mgmt.containerregistry.v2019_12_01_preview.operations.PrivateEndpointConnectionsOperations
4251
:ivar replications: Replications operations
@@ -74,10 +83,16 @@ def __init__(
7483
self._serialize = Serializer(client_models)
7584
self._deserialize = Deserializer(client_models)
7685

86+
self.export_pipelines = ExportPipelinesOperations(
87+
self._client, self.config, self._serialize, self._deserialize)
7788
self.registries = RegistriesOperations(
7889
self._client, self.config, self._serialize, self._deserialize)
90+
self.import_pipelines = ImportPipelinesOperations(
91+
self._client, self.config, self._serialize, self._deserialize)
7992
self.operations = Operations(
8093
self._client, self.config, self._serialize, self._deserialize)
94+
self.pipeline_runs = PipelineRunsOperations(
95+
self._client, self.config, self._serialize, self._deserialize)
8196
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
8297
self._client, self.config, self._serialize, self._deserialize)
8398
self.replications = ReplicationsOperations(

0 commit comments

Comments
 (0)