From 6ce8e8ba1b56b79154254483d25ab63b91b07ce8 Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 01/10] Revert "[Event Grid] Event grid C# code generation section. (#1561)" This reverts commit 461a494ef3ba48dcd5bfe77dfee2dc943405f337. From 11282f45e85a14d75c63a52fc42c424c77472003 Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 02/10] Revert "Bug Fix when linter runs on json file without being included in tag (#1560)" This reverts commit d6bc117b841fe49a506e560836470826c4d8ecb3. From c410d181985280e45cdc97bd1eafae07eac90bc1 Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 03/10] Revert "Remove databaseName uri param from Databases_Import op. (#1558)" This reverts commit 69d0a5d1f41f47498501f2b4700f901f3ca044e9. From 5a452ea873c8365a8e133cfd3d1d086c3bf363cc Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 04/10] Revert "Added 200 response for event grid event subscription delete operation. (#1555)" This reverts commit ad55af74f3f0e2b390a4306532528168ba742fef. From 14a7e549105ea21067a81373fd6f40f99198403e Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 05/10] Revert "Add some content to Swagger from docs.msft.com (#1549)" This reverts commit b95545848cb4e52006f48f6f8d4d16928b75aaa1. From 7c40193dd7dd325e22b695cb7d4351a4a9a2e49f Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 06/10] Revert "[Azure Analysis Services] Add gateway info to version 0714 and version 0801 (#1526)" This reverts commit bf407b7b72f209de3509ec1b3876d75df5fd459f. From 3093da20b8a2daf248741bd525a2dc438a8abc20 Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 07/10] Revert "Copied service endpoints specs to 2017-08-01 (#1548)" This reverts commit 64c905ae24bc3e8aeca5503f7d770a8081ea7a85. From 2c6395ac5aad103961cdc973775531226702d07d Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 08/10] Revert "Removed `x-ms-pageable` from Network Interface's `GetEffectiveRouteTable` and `ListEffectiveNetworkSecurityGroups` methods (#1547)" This reverts commit da940d51435e75535994f1c215b9504349af6d24. From ca286d7517794c12e5b6a17ad1213d13256f9107 Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 09/10] Revert "Added service endpoints APIs (#1533)" This reverts commit f69dc6475e4b6e6c32b8aa328724bc340ef2c18e. From 0db4c7039bfd140139eb71805aaf3279a3f29bb9 Mon Sep 17 00:00:00 2001 From: Scott Schaab Date: Fri, 18 Aug 2017 13:14:26 -0700 Subject: [PATCH 10/10] Revert "Added support for ECC to Key Vault (#1538)" This reverts commit 4a9084f40245ccfe60ae35e2fe067a065b766911. --- .../2016-10-01/keyvault.json | 43 +++---------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/2016-10-01/keyvault.json b/specification/keyvault/data-plane/Microsoft.KeyVault/2016-10-01/keyvault.json index e80ab6adb85e..320cab9739a1 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/2016-10-01/keyvault.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/2016-10-01/keyvault.json @@ -2923,8 +2923,8 @@ }, "kty": { "type": "string", - "description": "JsonWebKey key type (kty).", - "enum": [ "EC", "EC-HSM", "RSA", "RSA-HSM", "oct" ], + "description": "Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet. Kty is usually set to RSA", + "enum": [ "EC", "RSA", "RSA-HSM", "oct" ], "x-ms-enum": { "name": "JsonWebKeyType", "modelAsString": true @@ -2937,15 +2937,6 @@ "description": "Supported key operations." } }, - "crv": { - "type": "string", - "description": "Elliptic curve name. For valid values, see JsonWebKeyECName.", - "enum": [ "P-256", "P-384", "P-521", "SECP256K1" ], - "x-ms-enum": { - "name": "JsonWebKeyECName", - "modelAsString": true - } - }, "n": { "type": "string", "format": "base64url", @@ -2959,7 +2950,7 @@ "d": { "type": "string", "format": "base64url", - "description": "RSA private exponent, or the D component of an EC private key." + "description": "RSA private exponent." }, "dp": { "x-ms-client-name": "DP", @@ -2989,16 +2980,6 @@ "format": "base64url", "description": "RSA secret prime, with p < q." }, - "x": { - "type": "string", - "format": "base64url", - "description": "X component of an EC public key." - }, - "y": { - "type": "string", - "format": "base64url", - "description": "Y component of an EC public key." - }, "k": { "type": "string", "format": "base64url", @@ -3834,23 +3815,13 @@ "kty": { "type": "string", "minLength": 1, - "description": "The type of key to create. For valid values, see JsonWebKeyType.", - "enum": [ "EC", "EC-HSM", "RSA", "RSA-HSM", "oct" ], + "description": "The type of key to create. For valid key types, see JsonWebKeyType. Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet", + "enum": [ "EC", "RSA", "RSA-HSM", "oct" ], "x-ms-enum": { "name": "JsonWebKeyType", "modelAsString": true } }, - "crv": { - "x-ms-client-name": "curve", - "type": "string", - "description": "Elliptic curve name. For valid values, see JsonWebKeyECName.", - "enum": [ "P-256", "P-384", "P-521", "SECP256K1" ], - "x-ms-enum": { - "name": "JsonWebKeyECName", - "modelAsString": true - } - }, "key_size": { "type": "integer", "format": "int32", @@ -3937,7 +3908,7 @@ "type": "string", "minLength": 1, "description": "The signing/verification algorithm identifier. For more information on possible algorithm types, see JsonWebKeySignatureAlgorithm.", - "enum": [ "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL", "ES256", "ES384", "ES512", "ECDSA256" ], + "enum": [ "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL" ], "x-ms-enum": { "name": "JsonWebKeySignatureAlgorithm", "modelAsString": true @@ -3958,7 +3929,7 @@ "type": "string", "minLength": 1, "description": "The signing/verification algorithm. For more information on possible algorithm types, see JsonWebKeySignatureAlgorithm.", - "enum": [ "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL", "ES256", "ES384", "ES512", "ECDSA256" ], + "enum": [ "PS256", "PS384", "PS512", "RS256", "RS384", "RS512", "RSNULL" ], "x-ms-enum": { "name": "JsonWebKeySignatureAlgorithm", "modelAsString": true