Skip to content

Commit fae0494

Browse files
authored
Container Registry TSP (#44848)
* old generated files * new generated files with tsp * fix imports * formatting * fix url to endpoint * fix imports etc * update version * adjust pyproject.toml * fix tests * update to latest recorded tag * newline * mypy update * fix snippets * ci fixes * fix snippet * fix * point to tsp in specs repo * fix typing for model and remove some mypy ignores * fix black and snippet update * pylint * update snippets * formatting * formatting * sync snippets after black formatting * formatting fixes * sync snippets
1 parent f99f2fc commit fae0494

66 files changed

Lines changed: 6170 additions & 3482 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include *.md
2-
include azure/__init__.py
32
include LICENSE
3+
include azure/containerregistry/_generated/py.typed
44
recursive-include tests *.py
55
recursive-include samples *.py *.md
6-
include azure/containerregistry/py.typed
6+
include azure/__init__.py
7+
include azure/containerregistry/__init__.py

sdk/containerregistry/azure-containerregistry/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ with ContainerRegistryClient(self.endpoint, self.credential) as client:
136136
# Keep the three most recent images, delete everything else
137137
manifest_count = 0
138138
for manifest in client.list_manifest_properties(
139-
repository, order_by=ArtifactManifestOrder.LAST_UPDATED_ON_DESCENDING
139+
repository,
140+
order_by=ArtifactManifestOrder.LAST_UPDATED_ON_DESCENDING,
140141
):
141142
manifest_count += 1
142143
if manifest_count > 3:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"apiVersion": "2021-07-01"
3+
}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{
2+
"CrossLanguagePackageId": "ContainerRegistry",
3+
"CrossLanguageDefinitionId": {
4+
"azure.containerregistry.models.AcrAccessToken": "ContainerRegistryService.AcrAccessToken",
5+
"azure.containerregistry.models.AcrErrorInfo": "ContainerRegistryService.AcrErrorInfo",
6+
"azure.containerregistry.models.AcrErrors": "ContainerRegistryService.AcrErrors",
7+
"azure.containerregistry.models.AcrManifests": "ContainerRegistryService.AcrManifests",
8+
"azure.containerregistry.models.AcrRefreshToken": "ContainerRegistryService.AcrRefreshToken",
9+
"azure.containerregistry.models.Annotations": "ContainerRegistryService.Annotations",
10+
"azure.containerregistry.models.ArtifactManifestPlatform": "ContainerRegistryService.ArtifactManifestPlatform",
11+
"azure.containerregistry.models.ArtifactManifestProperties": "ContainerRegistryService.ArtifactManifestProperties",
12+
"azure.containerregistry.models.ArtifactTagProperties": "ContainerRegistryService.ArtifactTagProperties",
13+
"azure.containerregistry.models.ContainerRepositoryProperties": "ContainerRegistryService.ContainerRepositoryProperties",
14+
"azure.containerregistry.models.Descriptor": "ContainerRegistryService.Descriptor",
15+
"azure.containerregistry.models.FsLayer": "ContainerRegistryService.FsLayer",
16+
"azure.containerregistry.models.History": "ContainerRegistryService.History",
17+
"azure.containerregistry.models.ImageSignature": "ContainerRegistryService.ImageSignature",
18+
"azure.containerregistry.models.JWK": "ContainerRegistryService.JWK",
19+
"azure.containerregistry.models.JWKHeader": "ContainerRegistryService.JWKHeader",
20+
"azure.containerregistry.models.Manifest": "ContainerRegistryService.Manifest",
21+
"azure.containerregistry.models.ManifestAttributesBase": "ContainerRegistryService.ManifestAttributesBase",
22+
"azure.containerregistry.models.ManifestListAttributes": "ContainerRegistryService.ManifestListAttributes",
23+
"azure.containerregistry.models.ManifestWrapper": "ContainerRegistryService.ManifestWrapper",
24+
"azure.containerregistry.models.ManifestWriteableProperties": "ContainerRegistryService.ManifestChangeableAttributes",
25+
"azure.containerregistry.models.MultipartBodyParameter": "ContainerRegistryService.MultipartBodyParameter",
26+
"azure.containerregistry.models.Platform": "ContainerRegistryService.Platform",
27+
"azure.containerregistry.models.RepositoryWriteableProperties": "ContainerRegistryService.RepositoryChangeableAttributes",
28+
"azure.containerregistry.models.TagAttributesBase": "ContainerRegistryService.TagAttributesBase",
29+
"azure.containerregistry.models.TagList": "ContainerRegistryService.TagList",
30+
"azure.containerregistry.models.TagWriteableProperties": "ContainerRegistryService.TagChangeableAttributes",
31+
"azure.containerregistry.models.ArtifactTagOrder": "ContainerRegistryService.ArtifactTagOrder",
32+
"azure.containerregistry.models.ArtifactArchitecture": "ContainerRegistryService.ArtifactArchitecture",
33+
"azure.containerregistry.models.ArtifactOperatingSystem": "ContainerRegistryService.ArtifactOperatingSystem",
34+
"azure.containerregistry.models.ArtifactManifestOrder": "ContainerRegistryService.ArtifactManifestOrder",
35+
"azure.containerregistry.models.PostContentSchemaGrantType": "ContainerRegistryService.PostContentSchemaGrantType",
36+
"azure.containerregistry.models.TokenGrantType": "ContainerRegistryService.TokenGrantType",
37+
"azure.containerregistry.operations.ContainerRegistryOperations.check_docker_v2_support": "ContainerRegistryService.ContainerRegistry.checkDockerV2Support",
38+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.check_docker_v2_support": "ContainerRegistryService.ContainerRegistry.checkDockerV2Support",
39+
"azure.containerregistry.operations.ContainerRegistryOperations.get_manifest": "ContainerRegistryService.ContainerRegistry.getManifest",
40+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.get_manifest": "ContainerRegistryService.ContainerRegistry.getManifest",
41+
"azure.containerregistry.operations.ContainerRegistryOperations.create_manifest": "ContainerRegistryService.ContainerRegistry.createManifest",
42+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.create_manifest": "ContainerRegistryService.ContainerRegistry.createManifest",
43+
"azure.containerregistry.operations.ContainerRegistryOperations.delete_manifest": "ContainerRegistryService.ContainerRegistry.deleteManifest",
44+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.delete_manifest": "ContainerRegistryService.ContainerRegistry.deleteManifest",
45+
"azure.containerregistry.operations.ContainerRegistryOperations.get_repositories": "ContainerRegistryService.ContainerRegistry.getRepositories",
46+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.get_repositories": "ContainerRegistryService.ContainerRegistry.getRepositories",
47+
"azure.containerregistry.operations.ContainerRegistryOperations.get_properties": "ContainerRegistryService.ContainerRegistry.getProperties",
48+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.get_properties": "ContainerRegistryService.ContainerRegistry.getProperties",
49+
"azure.containerregistry.operations.ContainerRegistryOperations.delete_repository": "ContainerRegistryService.ContainerRegistry.deleteRepository",
50+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.delete_repository": "ContainerRegistryService.ContainerRegistry.deleteRepository",
51+
"azure.containerregistry.operations.ContainerRegistryOperations.update_properties": "ContainerRegistryService.ContainerRegistry.updateProperties",
52+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.update_properties": "ContainerRegistryService.ContainerRegistry.updateProperties",
53+
"azure.containerregistry.operations.ContainerRegistryOperations.get_tags": "ContainerRegistryService.ContainerRegistry.getTags",
54+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.get_tags": "ContainerRegistryService.ContainerRegistry.getTags",
55+
"azure.containerregistry.operations.ContainerRegistryOperations.get_tag_properties": "ContainerRegistryService.ContainerRegistry.getTagProperties",
56+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.get_tag_properties": "ContainerRegistryService.ContainerRegistry.getTagProperties",
57+
"azure.containerregistry.operations.ContainerRegistryOperations.update_tag_attributes": "ContainerRegistryService.ContainerRegistry.updateTagAttributes",
58+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.update_tag_attributes": "ContainerRegistryService.ContainerRegistry.updateTagAttributes",
59+
"azure.containerregistry.operations.ContainerRegistryOperations.delete_tag": "ContainerRegistryService.ContainerRegistry.deleteTag",
60+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.delete_tag": "ContainerRegistryService.ContainerRegistry.deleteTag",
61+
"azure.containerregistry.operations.ContainerRegistryOperations.get_manifests": "ContainerRegistryService.ContainerRegistry.getManifests",
62+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.get_manifests": "ContainerRegistryService.ContainerRegistry.getManifests",
63+
"azure.containerregistry.operations.ContainerRegistryOperations.get_manifest_properties": "ContainerRegistryService.ContainerRegistry.getManifestProperties",
64+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.get_manifest_properties": "ContainerRegistryService.ContainerRegistry.getManifestProperties",
65+
"azure.containerregistry.operations.ContainerRegistryOperations.update_manifest_properties": "ContainerRegistryService.ContainerRegistry.updateManifestProperties",
66+
"azure.containerregistry.aio.operations.ContainerRegistryOperations.update_manifest_properties": "ContainerRegistryService.ContainerRegistry.updateManifestProperties",
67+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.get_blob": "ContainerRegistryService.ContainerRegistryBlob.getBlob",
68+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.get_blob": "ContainerRegistryService.ContainerRegistryBlob.getBlob",
69+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.check_blob_exists": "ContainerRegistryService.ContainerRegistryBlob.checkBlobExists",
70+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.check_blob_exists": "ContainerRegistryService.ContainerRegistryBlob.checkBlobExists",
71+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.delete_blob": "ContainerRegistryService.ContainerRegistryBlob.deleteBlob",
72+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.delete_blob": "ContainerRegistryService.ContainerRegistryBlob.deleteBlob",
73+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.mount_blob": "ContainerRegistryService.ContainerRegistryBlob.mountBlob",
74+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.mount_blob": "ContainerRegistryService.ContainerRegistryBlob.mountBlob",
75+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.get_upload_status": "ContainerRegistryService.ContainerRegistryBlob.getUploadStatus",
76+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.get_upload_status": "ContainerRegistryService.ContainerRegistryBlob.getUploadStatus",
77+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.upload_chunk": "ContainerRegistryService.ContainerRegistryBlob.uploadChunk",
78+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.upload_chunk": "ContainerRegistryService.ContainerRegistryBlob.uploadChunk",
79+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.complete_upload": "ContainerRegistryService.ContainerRegistryBlob.completeUpload",
80+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.complete_upload": "ContainerRegistryService.ContainerRegistryBlob.completeUpload",
81+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.cancel_upload": "ContainerRegistryService.ContainerRegistryBlob.cancelUpload",
82+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.cancel_upload": "ContainerRegistryService.ContainerRegistryBlob.cancelUpload",
83+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.start_upload": "ContainerRegistryService.ContainerRegistryBlob.startUpload",
84+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.start_upload": "ContainerRegistryService.ContainerRegistryBlob.startUpload",
85+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.get_chunk": "ContainerRegistryService.ContainerRegistryBlob.getChunk",
86+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.get_chunk": "ContainerRegistryService.ContainerRegistryBlob.getChunk",
87+
"azure.containerregistry.operations.ContainerRegistryBlobOperations.check_chunk_exists": "ContainerRegistryService.ContainerRegistryBlob.checkChunkExists",
88+
"azure.containerregistry.aio.operations.ContainerRegistryBlobOperations.check_chunk_exists": "ContainerRegistryService.ContainerRegistryBlob.checkChunkExists",
89+
"azure.containerregistry.operations.AuthenticationOperations.exchange_aad_access_token_for_acr_refresh_token": "ContainerRegistryService.Authentication.exchangeAadAccessTokenForAcrRefreshToken",
90+
"azure.containerregistry.aio.operations.AuthenticationOperations.exchange_aad_access_token_for_acr_refresh_token": "ContainerRegistryService.Authentication.exchangeAadAccessTokenForAcrRefreshToken",
91+
"azure.containerregistry.operations.AuthenticationOperations.exchange_acr_refresh_token_for_acr_access_token": "ContainerRegistryService.Authentication.exchangeAcrRefreshTokenForAcrAccessToken",
92+
"azure.containerregistry.aio.operations.AuthenticationOperations.exchange_acr_refresh_token_for_acr_access_token": "ContainerRegistryService.Authentication.exchangeAcrRefreshTokenForAcrAccessToken",
93+
"azure.containerregistry.operations.AuthenticationOperations.get_acr_access_token_from_login": "ContainerRegistryService.Authentication.getAcrAccessTokenFromLogin",
94+
"azure.containerregistry.aio.operations.AuthenticationOperations.get_acr_access_token_from_login": "ContainerRegistryService.Authentication.getAcrAccessTokenFromLogin"
95+
}
96+
}

sdk/containerregistry/azure-containerregistry/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/containerregistry/azure-containerregistry",
5-
"Tag": "python/containerregistry/azure-containerregistry_55d84769d4"
5+
"Tag": "python/containerregistry/azure-containerregistry_98be10d599"
66
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__path__ = __import__("pkgutil").extend_path(__path__, __name__)
1+
__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore

sdk/containerregistry/azure-containerregistry/azure/containerregistry/_anonymous_exchange_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from azure.core.credentials import TokenCredential, AccessToken
99

1010
from ._exchange_client import ExchangeClientAuthenticationPolicy
11-
from ._generated import ContainerRegistry
11+
from ._generated import ContainerRegistryClient as ContainerRegistry
1212
from ._generated.models import TokenGrantType
1313
from ._generated.operations._patch import AuthenticationOperations
1414
from ._helpers import _parse_challenge
@@ -38,8 +38,8 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential
3838
endpoint = "https://" + endpoint
3939
self._endpoint = endpoint
4040
self._client = ContainerRegistry(
41+
endpoint=endpoint,
4142
credential=AnonymousAccessCredential(),
42-
url=endpoint,
4343
sdk_moniker=USER_AGENT,
4444
authentication_policy=ExchangeClientAuthenticationPolicy(),
4545
**kwargs

sdk/containerregistry/azure-containerregistry/azure/containerregistry/_base_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from ._authentication_policy import ContainerRegistryChallengePolicy
1414
from ._anonymous_exchange_client import AnonymousAccessCredential
15-
from ._generated import ContainerRegistry
15+
from ._generated import ContainerRegistryClient as ContainerRegistry
1616
from ._user_agent import USER_AGENT
1717

1818
ClientType = TypeVar("ClientType", bound="ContainerRegistryBaseClient")
@@ -39,8 +39,8 @@ class ContainerRegistryBaseClient(object):
3939
def __init__(self, endpoint: str, credential: Optional[TokenCredential], **kwargs: Any) -> None:
4040
self._auth_policy = ContainerRegistryChallengePolicy(credential, endpoint, **kwargs)
4141
self._client = ContainerRegistry(
42+
endpoint=endpoint,
4243
credential=credential or AnonymousAccessCredential(),
43-
url=endpoint,
4444
sdk_moniker=USER_AGENT,
4545
authentication_policy=self._auth_policy,
4646
**kwargs

0 commit comments

Comments
 (0)