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.

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

[KeyVault] Update data plane SDK to 0.3.0 #3251

Merged
merged 7 commits into from
May 10, 2017
Merged

[KeyVault] Update data plane SDK to 0.3.0 #3251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a99889
updating cli to use keyvault sdk 0.3.0
schaabs May 8, 2017
c5c7a9c
updating vm command module to use azure-keyvault 0.3.0 SDK
schaabs May 8, 2017
179e247
updating vm release history
schaabs May 8, 2017
f9750d7
fixed improper reference to KeyVaultClient.keyvault
schaabs May 9, 2017
a9a388e
updates per review feedback
schaabs May 9, 2017
ae10cef
reverting back to azure-keyvault 0.3.0 as 0.3.1 has introduces a bug …
schaabs May 9, 2017
2e01297
Merge branch 'master' into sdk-refactor-updates
schaabs May 9, 2017
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: 0 additions & 6 deletions src/command_modules/azure-cli-keyvault/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

Release History
===============

2.0.4 (2017-05-09)
++++++++++++++++++++

* Minor fixes.

2.0.3 (2017-05-05)
++++++++++++++++++++

Expand Down
13 changes: 3 additions & 10 deletions src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/_command_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,8 @@ def _execute_command(kwargs):
from msrest.exceptions import ValidationError, ClientRequestError
from msrestazure.azure_operation import AzureOperationPoller
from azure.cli.core._profile import Profile
from azure.keyvault import \
(KeyVaultClient, KeyVaultAuthentication)
from azure.keyvault.generated import \
(KeyVaultClient as BaseKeyVaultClient)
from azure.keyvault.generated.models import \
(KeyVaultErrorException)
from azure.keyvault import KeyVaultClient, KeyVaultAuthentication
from azure.keyvault.models import KeyVaultErrorException

try:

Expand All @@ -70,10 +66,7 @@ def get_token(server, resource, scope): # pylint: disable=unused-argument
op = get_op_handler(operation)
# since the convenience client can be inconvenient, we have to check and create the
# correct client version
if 'generated' in op.__module__:
client = BaseKeyVaultClient(KeyVaultAuthentication(get_token))
else:
client = KeyVaultClient(KeyVaultAuthentication(get_token)) # pylint: disable=redefined-variable-type
client = KeyVaultClient(KeyVaultAuthentication(get_token)) # pylint: disable=redefined-variable-type
result = op(client, **kwargs)

# apply results transform if specified
Expand Down
6 changes: 2 additions & 4 deletions src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
from azure.cli.core.util import get_json_object
from azure.keyvault import KeyVaultClient, KeyVaultAuthentication

from azure.keyvault.generated.models.key_vault_client_enums import \
(JsonWebKeyOperation)
from azure.keyvault.generated.models import \
(KeyAttributes, SecretAttributes, CertificateAttributes)
from azure.keyvault.models import JsonWebKeyOperation
from azure.keyvault.models import KeyAttributes, SecretAttributes, CertificateAttributes
from azure.cli.command_modules.keyvault._validators import \
(datetime_type, certificate_type,
get_attribute_validator,
Expand Down
3 changes: 1 addition & 2 deletions src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
from azure.cli.core.commands.validators import validate_tags
from azure.cli.core.util import CLIError

from azure.keyvault.generated.models.key_vault_client_enums \
import JsonWebKeyOperation
from azure.keyvault.models import JsonWebKeyOperation

secret_text_encoding_values = ['utf-8', 'utf-16le', 'utf-16be', 'ascii']
secret_binary_encoding_values = ['base64', 'hex']
Expand Down
81 changes: 40 additions & 41 deletions src/command_modules/azure-cli-keyvault/azure/cli/command_modules/keyvault/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
from ._client_factory import keyvault_client_factory, keyvault_client_vaults_factory
from ._command_type import cli_keyvault_data_plane_command

convenience_path = 'azure.keyvault.key_vault_client#{}'
base_client_path = 'azure.keyvault.generated.key_vault_client#{}'
data_client_path = 'azure.keyvault.key_vault_client#{}'
custom_path = 'azure.cli.command_modules.keyvault.custom#{}'
mgmt_path = 'azure.mgmt.keyvault.operations.vaults_operations#{}'

Expand Down Expand Up @@ -42,98 +41,98 @@
# Data Plane Commands

cli_keyvault_data_plane_command('keyvault key list',
convenience_path.format('KeyVaultClient.get_keys'))
data_client_path.format('KeyVaultClient.get_keys'))
cli_keyvault_data_plane_command('keyvault key list-versions',
convenience_path.format('KeyVaultClient.get_key_versions'))
data_client_path.format('KeyVaultClient.get_key_versions'))
cli_keyvault_data_plane_command('keyvault key create', custom_path.format('create_key'))
cli_keyvault_data_plane_command('keyvault key set-attributes',
base_client_path.format('KeyVaultClient.update_key'))
data_client_path.format('KeyVaultClient.update_key'))
cli_keyvault_data_plane_command('keyvault key show',
base_client_path.format('KeyVaultClient.get_key'))
data_client_path.format('KeyVaultClient.get_key'))
cli_keyvault_data_plane_command('keyvault key delete',
convenience_path.format('KeyVaultClient.delete_key'))
data_client_path.format('KeyVaultClient.delete_key'))
cli_keyvault_data_plane_command('keyvault key backup', custom_path.format('backup_key'))
cli_keyvault_data_plane_command('keyvault key restore', custom_path.format('restore_key'))
cli_keyvault_data_plane_command('keyvault key import', custom_path.format('import_key'))

cli_keyvault_data_plane_command('keyvault secret list',
convenience_path.format('KeyVaultClient.get_secrets'))
data_client_path.format('KeyVaultClient.get_secrets'))
cli_keyvault_data_plane_command('keyvault secret list-versions',
convenience_path.format('KeyVaultClient.get_secret_versions'))
data_client_path.format('KeyVaultClient.get_secret_versions'))
cli_keyvault_data_plane_command('keyvault secret set',
convenience_path.format('KeyVaultClient.set_secret'))
data_client_path.format('KeyVaultClient.set_secret'))
cli_keyvault_data_plane_command('keyvault secret set-attributes',
base_client_path.format('KeyVaultClient.update_secret'))
data_client_path.format('KeyVaultClient.update_secret'))
cli_keyvault_data_plane_command('keyvault secret show',
base_client_path.format('KeyVaultClient.get_secret'))
data_client_path.format('KeyVaultClient.get_secret'))
cli_keyvault_data_plane_command('keyvault secret delete',
convenience_path.format('KeyVaultClient.delete_secret'))
data_client_path.format('KeyVaultClient.delete_secret'))
cli_keyvault_data_plane_command('keyvault secret download', custom_path.format('download_secret'))

cli_keyvault_data_plane_command('keyvault certificate create',
custom_path.format('create_certificate'))
cli_keyvault_data_plane_command('keyvault certificate list',
convenience_path.format('KeyVaultClient.get_certificates'))
data_client_path.format('KeyVaultClient.get_certificates'))
cli_keyvault_data_plane_command('keyvault certificate list-versions',
convenience_path.format('KeyVaultClient.get_certificate_versions'))
data_client_path.format('KeyVaultClient.get_certificate_versions'))
cli_keyvault_data_plane_command('keyvault certificate show',
base_client_path.format('KeyVaultClient.get_certificate'))
data_client_path.format('KeyVaultClient.get_certificate'))
cli_keyvault_data_plane_command('keyvault certificate delete',
convenience_path.format('KeyVaultClient.delete_certificate'))
data_client_path.format('KeyVaultClient.delete_certificate'))
cli_keyvault_data_plane_command('keyvault certificate set-attributes',
base_client_path.format('KeyVaultClient.update_certificate'))
data_client_path.format('KeyVaultClient.update_certificate'))
cli_keyvault_data_plane_command('keyvault certificate import',
custom_path.format('import_certificate'))
cli_keyvault_data_plane_command('keyvault certificate download',
custom_path.format('download_certificate'))

cli_keyvault_data_plane_command('keyvault key list',
convenience_path.format('KeyVaultClient.get_keys'))
data_client_path.format('KeyVaultClient.get_keys'))
cli_keyvault_data_plane_command('keyvault key list-versions',
convenience_path.format('KeyVaultClient.get_key_versions'))
data_client_path.format('KeyVaultClient.get_key_versions'))
cli_keyvault_data_plane_command('keyvault key create', custom_path.format('create_key'))
cli_keyvault_data_plane_command('keyvault key set-attributes',
base_client_path.format('KeyVaultClient.update_key'))
data_client_path.format('KeyVaultClient.update_key'))
cli_keyvault_data_plane_command('keyvault key show',
base_client_path.format('KeyVaultClient.get_key'))
data_client_path.format('KeyVaultClient.get_key'))
cli_keyvault_data_plane_command('keyvault key delete',
convenience_path.format('KeyVaultClient.delete_key'))
data_client_path.format('KeyVaultClient.delete_key'))

cli_keyvault_data_plane_command('keyvault secret list',
convenience_path.format('KeyVaultClient.get_secrets'))
data_client_path.format('KeyVaultClient.get_secrets'))
cli_keyvault_data_plane_command('keyvault secret list-versions',
convenience_path.format('KeyVaultClient.get_secret_versions'))
data_client_path.format('KeyVaultClient.get_secret_versions'))
cli_keyvault_data_plane_command('keyvault secret set',
convenience_path.format('KeyVaultClient.set_secret'))
data_client_path.format('KeyVaultClient.set_secret'))
cli_keyvault_data_plane_command('keyvault secret set-attributes',
base_client_path.format('KeyVaultClient.update_secret'))
data_client_path.format('KeyVaultClient.update_secret'))
cli_keyvault_data_plane_command('keyvault secret show',
base_client_path.format('KeyVaultClient.get_secret'))
data_client_path.format('KeyVaultClient.get_secret'))
cli_keyvault_data_plane_command('keyvault secret delete',
convenience_path.format('KeyVaultClient.delete_secret'))
data_client_path.format('KeyVaultClient.delete_secret'))

cli_keyvault_data_plane_command('keyvault certificate create',
custom_path.format('create_certificate'))
cli_keyvault_data_plane_command('keyvault certificate list',
convenience_path.format('KeyVaultClient.get_certificates'))
data_client_path.format('KeyVaultClient.get_certificates'))
cli_keyvault_data_plane_command('keyvault certificate list-versions',
convenience_path.format('KeyVaultClient.get_certificate_versions'))
data_client_path.format('KeyVaultClient.get_certificate_versions'))
cli_keyvault_data_plane_command('keyvault certificate show',
base_client_path.format('KeyVaultClient.get_certificate'))
data_client_path.format('KeyVaultClient.get_certificate'))
cli_keyvault_data_plane_command('keyvault certificate delete',
convenience_path.format('KeyVaultClient.delete_certificate'))
data_client_path.format('KeyVaultClient.delete_certificate'))
cli_keyvault_data_plane_command('keyvault certificate set-attributes',
base_client_path.format('KeyVaultClient.update_certificate'))
data_client_path.format('KeyVaultClient.update_certificate'))

cli_keyvault_data_plane_command('keyvault certificate pending merge',
convenience_path.format('KeyVaultClient.merge_certificate'))
data_client_path.format('KeyVaultClient.merge_certificate'))
cli_keyvault_data_plane_command('keyvault certificate pending show',
convenience_path.format('KeyVaultClient.get_certificate_operation'))
cli_keyvault_data_plane_command('keyvault certificate pending delete', convenience_path.format(
data_client_path.format('KeyVaultClient.get_certificate_operation'))
cli_keyvault_data_plane_command('keyvault certificate pending delete', data_client_path.format(
'KeyVaultClient.delete_certificate_operation'))

cli_keyvault_data_plane_command('keyvault certificate contact list',
convenience_path.format('KeyVaultClient.get_certificate_contacts'))
data_client_path.format('KeyVaultClient.get_certificate_contacts'))
cli_keyvault_data_plane_command('keyvault certificate contact add',
custom_path.format('add_certificate_contact'))
cli_keyvault_data_plane_command('keyvault certificate contact delete',
Expand All @@ -142,13 +141,13 @@
cli_keyvault_data_plane_command('keyvault certificate issuer update',
custom_path.format('update_certificate_issuer'))
cli_keyvault_data_plane_command('keyvault certificate issuer list',
convenience_path.format('KeyVaultClient.get_certificate_issuers'))
data_client_path.format('KeyVaultClient.get_certificate_issuers'))
cli_keyvault_data_plane_command('keyvault certificate issuer create',
custom_path.format('create_certificate_issuer'))
cli_keyvault_data_plane_command('keyvault certificate issuer show',
convenience_path.format('KeyVaultClient.get_certificate_issuer'))
data_client_path.format('KeyVaultClient.get_certificate_issuer'))
cli_keyvault_data_plane_command('keyvault certificate issuer delete',
convenience_path.format('KeyVaultClient.delete_certificate_issuer'))
data_client_path.format('KeyVaultClient.delete_certificate_issuer'))

cli_keyvault_data_plane_command('keyvault certificate issuer admin list',
custom_path.format('list_certificate_issuer_admins'))
Expand Down
Loading