Skip to content
Closed
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
546 changes: 356 additions & 190 deletions azure-keyvault/azure/keyvault/key_vault_client.py
100755 → 100644

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions azure-keyvault/azure/keyvault/models/__init__.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
from .sas_definition_item_paged import SasDefinitionItemPaged
from .key_vault_client_enums import (
JsonWebKeyType,
JsonWebKeyECName,
DeletionRecoveryLevel,
KeyUsageType,
ActionType,
Expand Down Expand Up @@ -179,6 +180,7 @@
'StorageAccountItemPaged',
'SasDefinitionItemPaged',
'JsonWebKeyType',
'JsonWebKeyECName',
'DeletionRecoveryLevel',
'KeyUsageType',
'ActionType',
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/action.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/administrator_details.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/attributes.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/backup_key_result.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/backup_secret_result.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/certificate_attributes.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/certificate_bundle.py
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/certificate_issuer_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/certificate_issuer_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class CertificateIssuerItemPaged(Paged):
"""
A paging container for iterating over a list of CertificateIssuerItem object
A paging container for iterating over a list of :class:`CertificateIssuerItem <azure.keyvault.models.CertificateIssuerItem>` object
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autorest update, that's ok

"""

_attribute_map = {
Expand Down
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/certificate_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/certificate_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class CertificateItemPaged(Paged):
"""
A paging container for iterating over a list of CertificateItem object
A paging container for iterating over a list of :class:`CertificateItem <azure.keyvault.models.CertificateItem>` object
"""

_attribute_map = {
Expand Down
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/certificate_operation.py
100755 → 100644
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/certificate_policy.py
100755 → 100644
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/contact.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/contacts.py
100755 → 100644
Empty file.
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/deleted_certificate_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class DeletedCertificateItemPaged(Paged):
"""
A paging container for iterating over a list of DeletedCertificateItem object
A paging container for iterating over a list of :class:`DeletedCertificateItem <azure.keyvault.models.DeletedCertificateItem>` object
"""

_attribute_map = {
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/deleted_key_bundle.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/deleted_key_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/deleted_key_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class DeletedKeyItemPaged(Paged):
"""
A paging container for iterating over a list of DeletedKeyItem object
A paging container for iterating over a list of :class:`DeletedKeyItem <azure.keyvault.models.DeletedKeyItem>` object
"""

_attribute_map = {
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/deleted_secret_bundle.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/deleted_secret_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/deleted_secret_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class DeletedSecretItemPaged(Paged):
"""
A paging container for iterating over a list of DeletedSecretItem object
A paging container for iterating over a list of :class:`DeletedSecretItem <azure.keyvault.models.DeletedSecretItem>` object
"""

_attribute_map = {
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/error.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/issuer_attributes.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/issuer_bundle.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/issuer_credentials.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/issuer_parameters.py
100755 → 100644
Empty file.
23 changes: 18 additions & 5 deletions azure-keyvault/azure/keyvault/models/json_web_key.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,21 @@ class JsonWebKey(Model):

:param kid: Key identifier.
:type kid: str
:param kty: Supported JsonWebKey key types (kty) for Elliptic Curve, RSA,
HSM, Octet. Kty is usually set to RSA. Possible values include: 'EC',
'RSA', 'RSA-HSM', 'oct'
:param kty: JsonWebKey key type (kty). Possible values include: 'EC',
'EC-HSM', 'RSA', 'RSA-HSM', 'oct'
:type kty: str or :class:`JsonWebKeyType
<azure.keyvault.models.JsonWebKeyType>`
:param key_ops:
:type key_ops: list of str
:param crv: Elliptic curve name. For valid values, see JsonWebKeyECName.
Possible values include: 'P-256', 'P-384', 'P-521', 'SECP256K1'
:type crv: str or :class:`JsonWebKeyECName
<azure.keyvault.models.JsonWebKeyECName>`
:param n: RSA modulus.
:type n: bytes
:param e: RSA public exponent.
:type e: bytes
:param d: RSA private exponent.
:param d: RSA private exponent, or the D component of an EC private key.
:type d: bytes
:param dp: RSA private key parameter.
:type dp: bytes
Expand All @@ -40,6 +43,10 @@ class JsonWebKey(Model):
:type p: bytes
:param q: RSA secret prime, with p < q.
:type q: bytes
:param x: X component of an EC public key.
:type x: bytes
:param y: Y component of an EC public key.
:type y: bytes
:param k: Symmetric key.
:type k: bytes
:param t: HSM Token, used with 'Bring Your Own Key'.
Expand All @@ -50,6 +57,7 @@ class JsonWebKey(Model):
'kid': {'key': 'kid', 'type': 'str'},
'kty': {'key': 'kty', 'type': 'str'},
'key_ops': {'key': 'key_ops', 'type': '[str]'},
'crv': {'key': 'crv', 'type': 'str'},
'n': {'key': 'n', 'type': 'base64'},
'e': {'key': 'e', 'type': 'base64'},
'd': {'key': 'd', 'type': 'base64'},
Expand All @@ -58,14 +66,17 @@ class JsonWebKey(Model):
'qi': {'key': 'qi', 'type': 'base64'},
'p': {'key': 'p', 'type': 'base64'},
'q': {'key': 'q', 'type': 'base64'},
'x': {'key': 'x', 'type': 'base64'},
'y': {'key': 'y', 'type': 'base64'},
'k': {'key': 'k', 'type': 'base64'},
't': {'key': 'key_hsm', 'type': 'base64'},
}

def __init__(self, kid=None, kty=None, key_ops=None, n=None, e=None, d=None, dp=None, dq=None, qi=None, p=None, q=None, k=None, t=None):
def __init__(self, kid=None, kty=None, key_ops=None, crv=None, n=None, e=None, d=None, dp=None, dq=None, qi=None, p=None, q=None, x=None, y=None, k=None, t=None):
self.kid = kid
self.kty = kty
self.key_ops = key_ops
self.crv = crv
self.n = n
self.e = e
self.d = d
Expand All @@ -74,5 +85,7 @@ def __init__(self, kid=None, kty=None, key_ops=None, n=None, e=None, d=None, dp=
self.qi = qi
self.p = p
self.q = q
self.x = x
self.y = y
self.k = k
self.t = t
Empty file modified azure-keyvault/azure/keyvault/models/key_attributes.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/key_bundle.py
100755 → 100644
Empty file.
14 changes: 10 additions & 4 deletions azure-keyvault/azure/keyvault/models/key_create_parameters.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@
class KeyCreateParameters(Model):
"""The key create parameters.

:param kty: The type of key to create. For valid key types, see
JsonWebKeyType. Supported JsonWebKey key types (kty) for Elliptic Curve,
RSA, HSM, Octet. Possible values include: 'EC', 'RSA', 'RSA-HSM', 'oct'
:param kty: The type of key to create. For valid values, see
JsonWebKeyType. Possible values include: 'EC', 'EC-HSM', 'RSA', 'RSA-HSM',
'oct'
:type kty: str or :class:`JsonWebKeyType
<azure.keyvault.models.JsonWebKeyType>`
:param curve: Elliptic curve name. For valid values, see JsonWebKeyECName.
Possible values include: 'P-256', 'P-384', 'P-521', 'SECP256K1'
:type curve: str or :class:`JsonWebKeyECName
<azure.keyvault.models.JsonWebKeyECName>`
:param key_size: The key size in bytes. For example, 1024 or 2048.
:type key_size: int
:param key_ops:
Expand All @@ -38,14 +42,16 @@ class KeyCreateParameters(Model):

_attribute_map = {
'kty': {'key': 'kty', 'type': 'str'},
'curve': {'key': 'crv', 'type': 'str'},
'key_size': {'key': 'key_size', 'type': 'int'},
'key_ops': {'key': 'key_ops', 'type': '[str]'},
'key_attributes': {'key': 'attributes', 'type': 'KeyAttributes'},
'tags': {'key': 'tags', 'type': '{str}'},
}

def __init__(self, kty, key_size=None, key_ops=None, key_attributes=None, tags=None):
def __init__(self, kty, curve=None, key_size=None, key_ops=None, key_attributes=None, tags=None):
self.kty = kty
self.curve = curve
self.key_size = key_size
self.key_ops = key_ops
self.key_attributes = key_attributes
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/key_import_parameters.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/key_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/key_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class KeyItemPaged(Paged):
"""
A paging container for iterating over a list of KeyItem object
A paging container for iterating over a list of :class:`KeyItem <azure.keyvault.models.KeyItem>` object
"""

_attribute_map = {
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/key_operation_result.py
100755 → 100644
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/key_properties.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/key_restore_parameters.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/key_sign_parameters.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class KeySignParameters(Model):
:param algorithm: The signing/verification algorithm identifier. For more
information on possible algorithm types, see JsonWebKeySignatureAlgorithm.
Possible values include: 'PS256', 'PS384', 'PS512', 'RS256', 'RS384',
'RS512', 'RSNULL'
'RS512', 'RSNULL', 'ES256', 'ES384', 'ES512', 'ECDSA256'
:type algorithm: str or :class:`JsonWebKeySignatureAlgorithm
<azure.keyvault.models.JsonWebKeySignatureAlgorithm>`
:param value:
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/key_update_parameters.py
100755 → 100644
Empty file.
13 changes: 13 additions & 0 deletions azure-keyvault/azure/keyvault/models/key_vault_client_enums.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,20 @@
class JsonWebKeyType(Enum):

ec = "EC"
ec_hsm = "EC-HSM"
rsa = "RSA"
rsa_hsm = "RSA-HSM"
oct = "oct"


class JsonWebKeyECName(Enum):

p_256 = "P-256"
p_384 = "P-384"
p_521 = "P-521"
secp256_k1 = "SECP256K1"


class DeletionRecoveryLevel(Enum):

purgeable = "Purgeable"
Expand Down Expand Up @@ -73,3 +82,7 @@ class JsonWebKeySignatureAlgorithm(Enum):
rs384 = "RS384"
rs512 = "RS512"
rsnull = "RSNULL"
es256 = "ES256"
es384 = "ES384"
es512 = "ES512"
ecdsa256 = "ECDSA256"
Empty file modified azure-keyvault/azure/keyvault/models/key_vault_error.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/key_verify_parameters.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class KeyVerifyParameters(Model):
:param algorithm: The signing/verification algorithm. For more information
on possible algorithm types, see JsonWebKeySignatureAlgorithm. Possible
values include: 'PS256', 'PS384', 'PS512', 'RS256', 'RS384', 'RS512',
'RSNULL'
'RSNULL', 'ES256', 'ES384', 'ES512', 'ECDSA256'
:type algorithm: str or :class:`JsonWebKeySignatureAlgorithm
<azure.keyvault.models.JsonWebKeySignatureAlgorithm>`
:param digest: The digest used for signing.
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/key_verify_result.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/lifetime_action.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/organization_details.py
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/sas_definition_bundle.py
100755 → 100644
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/sas_definition_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/sas_definition_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class SasDefinitionItemPaged(Paged):
"""
A paging container for iterating over a list of SasDefinitionItem object
A paging container for iterating over a list of :class:`SasDefinitionItem <azure.keyvault.models.SasDefinitionItem>` object
"""

_attribute_map = {
Expand Down
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/secret_attributes.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/secret_bundle.py
100755 → 100644
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/secret_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/secret_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class SecretItemPaged(Paged):
"""
A paging container for iterating over a list of SecretItem object
A paging container for iterating over a list of :class:`SecretItem <azure.keyvault.models.SecretItem>` object
"""

_attribute_map = {
Expand Down
Empty file modified azure-keyvault/azure/keyvault/models/secret_properties.py
100755 → 100644
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/secret_set_parameters.py
100755 → 100644
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/storage_account_item.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion azure-keyvault/azure/keyvault/models/storage_account_item_paged.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class StorageAccountItemPaged(Paged):
"""
A paging container for iterating over a list of StorageAccountItem object
A paging container for iterating over a list of :class:`StorageAccountItem <azure.keyvault.models.StorageAccountItem>` object
"""

_attribute_map = {
Expand Down
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/storage_bundle.py
100755 → 100644
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/models/trigger.py
100755 → 100644
Empty file.
Empty file.
Empty file modified azure-keyvault/azure/keyvault/version.py
100755 → 100644
Empty file.