Skip to content

[AutoPR authorization/resource-manager] fix the hardcoding of api version for classicadmin in powershell #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AutorestCI merged 2 commits into from
Feb 21, 2018
Merged

[AutoPR authorization/resource-manager] fix the hardcoding of api version for classicadmin in powershell #1993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f23d1a1
Generated from 80afa52b390ebc93e528ab47d32fe4f95bae49cf
AutorestCI Feb 15, 2018
b84d7ea
Generated from 228c368e8b1956804f353314932a9a506630e8dd
AutorestCI Feb 21, 2018
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
9 changes: 5 additions & 4 deletions ...mt-authorization/azure/mgmt/authorization/operations/classic_administrators_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class ClassicAdministratorsOperations(object):
:param client: Client for service requests.
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An objec model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2015-07-01".
:param deserializer: An object model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2015-06-01".
"""

models = models
Expand All @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2015-07-01"
self.api_version = "2015-06-01"

self.config = config

Expand All @@ -56,7 +56,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/classicAdministrators'
url = self.list.metadata['url']
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
}
Expand Down Expand Up @@ -101,3 +101,4 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/classicAdministrators'}
8 changes: 5 additions & 3 deletions azure-mgmt-authorization/azure/mgmt/authorization/operations/permissions_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class PermissionsOperations(object):
:param client: Client for service requests.
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An objec model deserializer.
:param deserializer: An object model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview".
"""

Expand Down Expand Up @@ -57,7 +57,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Authorization/permissions'
url = self.list_for_resource_group.metadata['url']
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
Expand Down Expand Up @@ -103,6 +103,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_for_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Authorization/permissions'}

def list_for_resource(
self, resource_group_name, resource_provider_namespace, parent_resource_path, resource_type, resource_name, custom_headers=None, raw=False, **operation_config):
Expand Down Expand Up @@ -134,7 +135,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/permissions'
url = self.list_for_resource.metadata['url']
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'resourceProviderNamespace': self._serialize.url("resource_provider_namespace", resource_provider_namespace, 'str'),
Expand Down Expand Up @@ -184,3 +185,4 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_for_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/permissions'}
8 changes: 5 additions & 3 deletions ...horization/azure/mgmt/authorization/operations/provider_operations_metadata_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ProviderOperationsMetadataOperations(object):
:param client: Client for service requests.
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An objec model deserializer.
:param deserializer: An object model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview".
"""

Expand Down Expand Up @@ -57,7 +57,7 @@ def get(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/providers/Microsoft.Authorization/providerOperations/{resourceProviderNamespace}'
url = self.get.metadata['url']
path_format_arguments = {
'resourceProviderNamespace': self._serialize.url("resource_provider_namespace", resource_provider_namespace, 'str')
}
Expand Down Expand Up @@ -98,6 +98,7 @@ def get(
return client_raw_response

return deserialized
get.metadata = {'url': '/providers/Microsoft.Authorization/providerOperations/{resourceProviderNamespace}'}

def list(
self, expand="resourceTypes", custom_headers=None, raw=False, **operation_config):
Expand All @@ -119,7 +120,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/providers/Microsoft.Authorization/providerOperations'
url = self.list.metadata['url']

# Construct parameters
query_parameters = {}
Expand Down Expand Up @@ -162,3 +163,4 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list.metadata = {'url': '/providers/Microsoft.Authorization/providerOperations'}
32 changes: 21 additions & 11 deletions azure-mgmt-authorization/azure/mgmt/authorization/operations/role_assignments_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class RoleAssignmentsOperations(object):
:param client: Client for service requests.
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An objec model deserializer.
:param deserializer: An object model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview".
"""

Expand Down Expand Up @@ -72,7 +72,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/roleAssignments'
url = self.list_for_resource.metadata['url']
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'resourceProviderNamespace': self._serialize.url("resource_provider_namespace", resource_provider_namespace, 'str'),
Expand Down Expand Up @@ -124,6 +124,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_for_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{parentResourcePath}/{resourceType}/{resourceName}/providers/Microsoft.Authorization/roleAssignments'}

def list_for_resource_group(
self, resource_group_name, filter=None, custom_headers=None, raw=False, **operation_config):
Expand All @@ -150,7 +151,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Authorization/roleAssignments'
url = self.list_for_resource_group.metadata['url']
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
Expand Down Expand Up @@ -198,6 +199,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_for_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Authorization/roleAssignments'}

def delete(
self, scope, role_assignment_name, custom_headers=None, raw=False, **operation_config):
Expand All @@ -219,7 +221,7 @@ def delete(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'
url = self.delete.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True),
'roleAssignmentName': self._serialize.url("role_assignment_name", role_assignment_name, 'str')
Expand Down Expand Up @@ -259,6 +261,7 @@ def delete(
return client_raw_response

return deserialized
delete.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'}

def create(
self, scope, role_assignment_name, parameters, custom_headers=None, raw=False, **operation_config):
Expand Down Expand Up @@ -289,7 +292,7 @@ def create(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'
url = self.create.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True),
'roleAssignmentName': self._serialize.url("role_assignment_name", role_assignment_name, 'str')
Expand Down Expand Up @@ -333,6 +336,7 @@ def create(
return client_raw_response

return deserialized
create.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'}

def get(
self, scope, role_assignment_name, custom_headers=None, raw=False, **operation_config):
Expand All @@ -353,7 +357,7 @@ def get(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'
url = self.get.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True),
'roleAssignmentName': self._serialize.url("role_assignment_name", role_assignment_name, 'str')
Expand Down Expand Up @@ -393,6 +397,7 @@ def get(
return client_raw_response

return deserialized
get.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments/{roleAssignmentName}'}

def delete_by_id(
self, role_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -411,7 +416,7 @@ def delete_by_id(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{roleId}'
url = self.delete_by_id.metadata['url']
path_format_arguments = {
'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True)
}
Expand Down Expand Up @@ -450,6 +455,7 @@ def delete_by_id(
return client_raw_response

return deserialized
delete_by_id.metadata = {'url': '/{roleId}'}

def create_by_id(
self, role_id, parameters, custom_headers=None, raw=False, **operation_config):
Expand All @@ -471,7 +477,7 @@ def create_by_id(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{roleId}'
url = self.create_by_id.metadata['url']
path_format_arguments = {
'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True)
}
Expand Down Expand Up @@ -514,6 +520,7 @@ def create_by_id(
return client_raw_response

return deserialized
create_by_id.metadata = {'url': '/{roleId}'}

def get_by_id(
self, role_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -532,7 +539,7 @@ def get_by_id(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{roleId}'
url = self.get_by_id.metadata['url']
path_format_arguments = {
'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True)
}
Expand Down Expand Up @@ -571,6 +578,7 @@ def get_by_id(
return client_raw_response

return deserialized
get_by_id.metadata = {'url': '/{roleId}'}

def list(
self, filter=None, custom_headers=None, raw=False, **operation_config):
Expand All @@ -595,7 +603,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/roleAssignments'
url = self.list.metadata['url']
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
}
Expand Down Expand Up @@ -642,6 +650,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Authorization/roleAssignments'}

def list_for_scope(
self, scope, filter=None, custom_headers=None, raw=False, **operation_config):
Expand All @@ -668,7 +677,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleAssignments'
url = self.list_for_scope.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True)
}
Expand Down Expand Up @@ -715,3 +724,4 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list_for_scope.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleAssignments'}
17 changes: 11 additions & 6 deletions azure-mgmt-authorization/azure/mgmt/authorization/operations/role_definitions_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class RoleDefinitionsOperations(object):
:param client: Client for service requests.
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An objec model deserializer.
:param deserializer: An object model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2018-01-01-preview".
"""

Expand Down Expand Up @@ -56,7 +56,7 @@ def delete(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'
url = self.delete.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True),
'roleDefinitionId': self._serialize.url("role_definition_id", role_definition_id, 'str')
Expand Down Expand Up @@ -96,6 +96,7 @@ def delete(
return client_raw_response

return deserialized
delete.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'}

def get(
self, scope, role_definition_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -116,7 +117,7 @@ def get(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'
url = self.get.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True),
'roleDefinitionId': self._serialize.url("role_definition_id", role_definition_id, 'str')
Expand Down Expand Up @@ -156,6 +157,7 @@ def get(
return client_raw_response

return deserialized
get.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'}

def create_or_update(
self, scope, role_definition_id, role_definition, custom_headers=None, raw=False, **operation_config):
Expand All @@ -178,7 +180,7 @@ def create_or_update(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'
url = self.create_or_update.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True),
'roleDefinitionId': self._serialize.url("role_definition_id", role_definition_id, 'str')
Expand Down Expand Up @@ -222,6 +224,7 @@ def create_or_update(
return client_raw_response

return deserialized
create_or_update.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions/{roleDefinitionId}'}

def list(
self, scope, filter=None, custom_headers=None, raw=False, **operation_config):
Expand All @@ -246,7 +249,7 @@ def internal_paging(next_link=None, raw=False):

if not next_link:
# Construct URL
url = '/{scope}/providers/Microsoft.Authorization/roleDefinitions'
url = self.list.metadata['url']
path_format_arguments = {
'scope': self._serialize.url("scope", scope, 'str', skip_quote=True)
}
Expand Down Expand Up @@ -293,6 +296,7 @@ def internal_paging(next_link=None, raw=False):
return client_raw_response

return deserialized
list.metadata = {'url': '/{scope}/providers/Microsoft.Authorization/roleDefinitions'}

def get_by_id(
self, role_id, custom_headers=None, raw=False, **operation_config):
Expand All @@ -316,7 +320,7 @@ def get_by_id(
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
# Construct URL
url = '/{roleId}'
url = self.get_by_id.metadata['url']
path_format_arguments = {
'roleId': self._serialize.url("role_id", role_id, 'str', skip_quote=True)
}
Expand Down Expand Up @@ -355,3 +359,4 @@ def get_by_id(
return client_raw_response

return deserialized
get_by_id.metadata = {'url': '/{roleId}'}