Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d7bcfe6
changing ContainerRepositoryClient to ContainerRepository
seankane-msft Apr 27, 2021
7a0b598
renaming files
seankane-msft Apr 27, 2021
15bbaaf
re-recording, commenting out tests that are not necessary
seankane-msft Apr 27, 2021
b91302c
working sync registry artifact class
seankane-msft Apr 28, 2021
6f7c55c
async registry artifact
seankane-msft Apr 28, 2021
22ecb18
issue with recording infra that is removing an acr specific oauth path
seankane-msft Apr 28, 2021
d5986dd
pylint issues
seankane-msft Apr 28, 2021
1287136
recording and processors
seankane-msft Apr 28, 2021
145949b
removing commented out code
seankane-msft Apr 28, 2021
09f3636
undoing changes to cache
seankane-msft Apr 28, 2021
6e38bf1
more lint fixes
seankane-msft Apr 28, 2021
d9659c0
help with logging output
seankane-msft Apr 28, 2021
941473a
change to list_repository_names
seankane-msft Apr 28, 2021
44ceace
renaming for consistency
seankane-msft Apr 28, 2021
4e5dbc8
all changes made, plus recordings
seankane-msft Apr 28, 2021
f7caebd
fixing up more tests again!
seankane-msft Apr 28, 2021
6ced986
formatting
seankane-msft Apr 28, 2021
5417f1d
merge conflicts
seankane-msft Apr 29, 2021
83c0d90
fixing up merge issues
seankane-msft May 3, 2021
c0ed9ff
merge conflicts
seankane-msft May 3, 2021
ed3f937
more conflicts
seankane-msft May 3, 2021
ccec23b
undoing changes to gen code
seankane-msft May 3, 2021
afa0c1b
pylint issues
seankane-msft May 4, 2021
0e2e335
consistent naming
seankane-msft May 4, 2021
24cb3a0
changes
seankane-msft May 4, 2021
0dcd6cd
anon test
seankane-msft May 4, 2021
62964e8
small changes to generated, eventually will be reflected in the swagger
seankane-msft May 5, 2021
64937b8
adding basics for anon
seankane-msft May 5, 2021
315c9f8
adding test infra
seankane-msft May 5, 2021
abd4e4e
adding async tests
seankane-msft May 5, 2021
119575e
adding more tests for anon container repo and reg artifact
seankane-msft May 5, 2021
7c31693
added async anon client
seankane-msft May 6, 2021
0c9e77a
asserting credential is false
seankane-msft May 6, 2021
7f57d03
fixing scrubber
seankane-msft May 6, 2021
d260ff9
new swagger
seankane-msft May 6, 2021
8fbf308
merge conflicts
seankane-msft May 6, 2021
dc033e9
merge conflicts reflected in tests
seankane-msft May 6, 2021
9a93a9c
lint
seankane-msft May 6, 2021
c06fecd
updating tests and resource for anonymous access
seankane-msft May 6, 2021
2b78a40
updating generated code
seankane-msft May 7, 2021
77aed4b
merge conflicts
seankane-msft May 9, 2021
67887d6
undoing generated code changes
seankane-msft May 9, 2021
4e7c9b6
shouldnt have done that oops
seankane-msft May 9, 2021
86f86aa
undoing unnecessary changes to recordings
seankane-msft May 9, 2021
87b1928
changelog
seankane-msft May 9, 2021
3255a2d
merge conflicts
seankane-msft May 11, 2021
68f7bfd
anna and mccoys comments
seankane-msft May 11, 2021
8a254ab
lint fixes
seankane-msft May 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
undoing generated code changes
  • Loading branch information
seankane-msft committed May 9, 2021
commit 67887d6c977891f2deac890d06c62f166e30baaa
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ async def exchange_acr_refresh_token_for_acr_access_token(
service: str,
scope: str,
refresh_token: str,
grant_type: Union[str, "_models.TokenGrantType"] = "refresh_token",
grant_type: Union[str, "_models.Enum2"] = "refresh_token",
**kwargs
) -> "_models.AcrAccessToken":
"""Exchange ACR Refresh token for an ACR Access Token.
Expand All @@ -121,7 +121,7 @@ async def exchange_acr_refresh_token_for_acr_access_token(
:param refresh_token: Must be a valid ACR refresh token.
:type refresh_token: str
:param grant_type: Grant type is expected to be refresh_token.
:type grant_type: str or ~container_registry.models.TokenGrantType
:type grant_type: str or ~container_registry.models.Enum2
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AcrAccessToken, or the result of cls(response)
:rtype: ~container_registry.models.AcrAccessToken
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@
from ._container_registry_enums import (
ArtifactArchitecture,
ArtifactOperatingSystem,
Enum2,
ManifestOrderBy,
TagOrderBy,
TokenGrantType,
)

__all__ = [
Expand Down Expand Up @@ -129,7 +129,7 @@
'V2Manifest',
'ArtifactArchitecture',
'ArtifactOperatingSystem',
'Enum2',
'ManifestOrderBy',
'TagOrderBy',
'TokenGrantType',
]
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ class ArtifactOperatingSystem(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum
SOLARIS = "solaris"
WINDOWS = "windows"

class Enum2(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
"""Grant type is expected to be refresh_token
"""

REFRESH_TOKEN = "refresh_token"
PASSWORD = "password"

class ManifestOrderBy(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
"""Sort options for ordering manifests in a collection.
"""
Expand All @@ -76,10 +83,3 @@ class TagOrderBy(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
LAST_UPDATED_ON_DESCENDING = "timedesc"
#: Order tags by LastUpdatedOn field, from least recently updated to most recently updated.
LAST_UPDATED_ON_ASCENDING = "timeasc"

class TokenGrantType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
"""Grant type is expected to be refresh_token
"""

REFRESH_TOKEN = "refresh_token"
PASSWORD = "password"
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ class PathsV3R3RxOauth2TokenPostRequestbodyContentApplicationXWwwFormUrlencodedS

:param grant_type: Required. Grant type is expected to be refresh_token. Possible values
include: "refresh_token", "password".
:type grant_type: str or ~container_registry.models.TokenGrantType
:type grant_type: str or ~container_registry.models.Enum2
:param service: Required. Indicates the name of your Azure container registry.
:type service: str
:param scope: Required. Which is expected to be a valid scope, and can be specified more than
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ class PathsV3R3RxOauth2TokenPostRequestbodyContentApplicationXWwwFormUrlencodedS

:param grant_type: Required. Grant type is expected to be refresh_token. Possible values
include: "refresh_token", "password".
:type grant_type: str or ~container_registry.models.TokenGrantType
:type grant_type: str or ~container_registry.models.Enum2
:param service: Required. Indicates the name of your Azure container registry.
:type service: str
:param scope: Required. Which is expected to be a valid scope, and can be specified more than
Expand Down Expand Up @@ -1088,7 +1088,7 @@ class PathsV3R3RxOauth2TokenPostRequestbodyContentApplicationXWwwFormUrlencodedS
def __init__(
self,
*,
grant_type: Union[str, "TokenGrantType"] = "refresh_token",
grant_type: Union[str, "Enum2"] = "refresh_token",
service: str,
scope: str,
acr_refresh_token: str,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def exchange_acr_refresh_token_for_acr_access_token(
service, # type: str
scope, # type: str
refresh_token, # type: str
grant_type="refresh_token", # type: Union[str, "_models.TokenGrantType"]
grant_type="refresh_token", # type: Union[str, "_models.Enum2"]
**kwargs # type: Any
):
# type: (...) -> "_models.AcrAccessToken"
Expand All @@ -127,7 +127,7 @@ def exchange_acr_refresh_token_for_acr_access_token(
:param refresh_token: Must be a valid ACR refresh token.
:type refresh_token: str
:param grant_type: Grant type is expected to be refresh_token.
:type grant_type: str or ~container_registry.models.TokenGrantType
:type grant_type: str or ~container_registry.models.Enum2
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AcrAccessToken, or the result of cls(response)
:rtype: ~container_registry.models.AcrAccessToken
Expand Down