Skip to content
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.

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

Hdinsight release 2018 06 #13137

Merged
merged 4 commits into from
Aug 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions sdk/hdinsight/azure-mgmt-hdinsight/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release History

## 1.7.0 (2020-08-13)

**Features**

- Model DiskEncryptionProperties has a new parameter encryption_at_host

## 1.6.0 (2020-07-17)

**Features**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,9 @@ class DiskEncryptionProperties(Model):
:param msi_resource_id: Resource ID of Managed Identity that is used to
access the key vault.
:type msi_resource_id: str
:param encryption_at_host: Indicates whether or not resource disk
encryption is enabled. Default value: False .
:type encryption_at_host: bool
"""

_attribute_map = {
Expand All @@ -1196,6 +1199,7 @@ class DiskEncryptionProperties(Model):
'key_version': {'key': 'keyVersion', 'type': 'str'},
'encryption_algorithm': {'key': 'encryptionAlgorithm', 'type': 'str'},
'msi_resource_id': {'key': 'msiResourceId', 'type': 'str'},
'encryption_at_host': {'key': 'encryptionAtHost', 'type': 'bool'},
}

def __init__(self, **kwargs):
Expand All @@ -1205,6 +1209,7 @@ def __init__(self, **kwargs):
self.key_version = kwargs.get('key_version', None)
self.encryption_algorithm = kwargs.get('encryption_algorithm', None)
self.msi_resource_id = kwargs.get('msi_resource_id', None)
self.encryption_at_host = kwargs.get('encryption_at_host', False)


class EncryptionInTransitProperties(Model):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,9 @@ class DiskEncryptionProperties(Model):
:param msi_resource_id: Resource ID of Managed Identity that is used to
access the key vault.
:type msi_resource_id: str
:param encryption_at_host: Indicates whether or not resource disk
encryption is enabled. Default value: False .
:type encryption_at_host: bool
"""

_attribute_map = {
Expand All @@ -1196,15 +1199,17 @@ class DiskEncryptionProperties(Model):
'key_version': {'key': 'keyVersion', 'type': 'str'},
'encryption_algorithm': {'key': 'encryptionAlgorithm', 'type': 'str'},
'msi_resource_id': {'key': 'msiResourceId', 'type': 'str'},
'encryption_at_host': {'key': 'encryptionAtHost', 'type': 'bool'},
}

def __init__(self, *, vault_uri: str=None, key_name: str=None, key_version: str=None, encryption_algorithm=None, msi_resource_id: str=None, **kwargs) -> None:
def __init__(self, *, vault_uri: str=None, key_name: str=None, key_version: str=None, encryption_algorithm=None, msi_resource_id: str=None, encryption_at_host: bool=False, **kwargs) -> None:
super(DiskEncryptionProperties, self).__init__(**kwargs)
self.vault_uri = vault_uri
self.key_name = key_name
self.key_version = key_version
self.encryption_algorithm = encryption_algorithm
self.msi_resource_id = msi_resource_id
self.encryption_at_host = encryption_at_host


class EncryptionInTransitProperties(Model):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "1.6.0"
VERSION = "1.7.0"

2 changes: 1 addition & 1 deletion sdk/hdinsight/azure-mgmt-hdinsight/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
pass

# Version extraction inspired from 'requests'
with open(os.path.join(package_folder_path, 'version.py')
with open(os.path.join(package_folder_path, 'version.py')
if os.path.exists(os.path.join(package_folder_path, 'version.py'))
else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading