Skip to content

[AutoPR search/resource-manager] Azure Search: Resource Manager: Support 'None' Identity type #4480

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
Mar 7, 2019
Merged

[AutoPR search/resource-manager] Azure Search: Resource Manager: Support 'None' Identity type #4480

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
0a9ed93
Generated from f0fe70b51825fdec12d01df500646be7e4dcff54
AutorestCI Mar 5, 2019
fe74c52
Packaging update of azure-mgmt-search
azuresdkci Mar 5, 2019
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
1 change: 1 addition & 0 deletions azure-mgmt-search/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
recursive-include tests *.py *.yaml
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
Expand Down
2 changes: 2 additions & 0 deletions azure-mgmt-search/azure/mgmt/search/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
HostingMode,
SearchServiceStatus,
ProvisioningState,
IdentityType,
AdminKeyKind,
)

Expand All @@ -65,5 +66,6 @@
'HostingMode',
'SearchServiceStatus',
'ProvisioningState',
'IdentityType',
'AdminKeyKind',
]
12 changes: 6 additions & 6 deletions azure-mgmt-search/azure/mgmt/search/models/identity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ class Identity(Model):
:vartype principal_id: str
:ivar tenant_id: The tenant ID of resource.
:vartype tenant_id: str
:ivar type: Required. The identity type. Default value: "SystemAssigned" .
:vartype type: str
:param type: Required. The identity type. Possible values include: 'None',
'SystemAssigned'
:type type: str or ~azure.mgmt.search.models.IdentityType
"""

_validation = {
'principal_id': {'readonly': True},
'tenant_id': {'readonly': True},
'type': {'required': True, 'constant': True},
'type': {'required': True},
}

_attribute_map = {
'principal_id': {'key': 'principalId', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'type': {'key': 'type', 'type': 'IdentityType'},
}

type = "SystemAssigned"

def __init__(self, **kwargs):
super(Identity, self).__init__(**kwargs)
self.principal_id = None
self.tenant_id = None
self.type = kwargs.get('type', None)
14 changes: 7 additions & 7 deletions azure-mgmt-search/azure/mgmt/search/models/identity_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ class Identity(Model):
:vartype principal_id: str
:ivar tenant_id: The tenant ID of resource.
:vartype tenant_id: str
:ivar type: Required. The identity type. Default value: "SystemAssigned" .
:vartype type: str
:param type: Required. The identity type. Possible values include: 'None',
'SystemAssigned'
:type type: str or ~azure.mgmt.search.models.IdentityType
"""

_validation = {
'principal_id': {'readonly': True},
'tenant_id': {'readonly': True},
'type': {'required': True, 'constant': True},
'type': {'required': True},
}

_attribute_map = {
'principal_id': {'key': 'principalId', 'type': 'str'},
'tenant_id': {'key': 'tenantId', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'type': {'key': 'type', 'type': 'IdentityType'},
}

type = "SystemAssigned"

def __init__(self, **kwargs) -> None:
def __init__(self, *, type, **kwargs) -> None:
super(Identity, self).__init__(**kwargs)
self.principal_id = None
self.tenant_id = None
self.type = type
6 changes: 6 additions & 0 deletions azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ class ProvisioningState(str, Enum):
failed = "failed"


class IdentityType(str, Enum):

none = "None"
system_assigned = "SystemAssigned"


class AdminKeyKind(str, Enum):

primary = "primary"
Expand Down
3 changes: 2 additions & 1 deletion azure-mgmt-search/azure/mgmt/search/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "2.1.0"
VERSION = "2015-08-19"