Merge pull request Azure#10 from amarzavery/fixkv

removed description from the x-ms-enum extension
matthchr · Aug 19, 2016 · 32f1111 · 32f1111
2 parents a627ed2 + 0dfa1b8
commit 32f1111
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,15 +6,15 @@ services:
 env:
   matrix:
   - MODE=syntax
-  - MODE=python
-  - MODE=node
+  #- MODE=python
+  #- MODE=node
   global:
     secure: IwPVExGJQfL6QpTd6Utv3R/qBz7yApgMspzMLSkrq9cMP6t+NHk1vYg0n2evcWaq2rqNZE9xBMfRZi7Yy/RCUT++qALE89xlNvZ/A94PaDUiK3tYYNj1XxsgRauCHshXz6smmLwQMpTKsEl6lyjXeXpwQMDNRehhTu0Hg2tE7ZikfQVb+jjRNcP41RfzzGQyxEhd3fxF2G1G21WXH0cXtZssOd1MYcXhmXk8dR3DyEEMbPzDV1Bk3auXOvbqS79bnZ/Pi4p/7P/aTOm8O2ACKM0XAvww95vAQ0LcPzKnNe3sNjFVAssBiZbIk0Zs30wULBphlTxVoufHKSZuTf+QEBTKpH99v/+SBDDPu9+0q2esq7TKgf8bvzkeXjh54fECdJUqEo9E2gW08+RQxWCqryMJouOPcY2OMs4lZwSMOXQY68a/CYVRWFaFg5s6jntC8sLHtDxV0qem3xyjc+852v8rUfkyvMhOBoZJjWmnqYVqdamHOOfrzjc7AzPUEzSeiN6OPPVli+SzwLHdip0GxdK46pAISCOcbdyYn11VvTIn1QosE66eWhF6SViVH6lNWgSfVTpcQ2zq/qSKh0/zpwn82Ys+wKDOf3EwQAanndgk26npi7Ik4nIuexZ/TE56rQ7qjZqmHoxFz7QMeTZDiVmLFxtR19cTT3GLxDz8nBQ=
 before_install:
-  - docker pull lmazuel/swagger-to-sdk
-  - python -c "import os; print('\n'.join(v for v in os.environ.keys() if v.startswith('TRAVIS')))" > /tmp/env_file
+  #- docker pull lmazuel/swagger-to-sdk
+  #- python -c "import os; print('\n'.join(v for v in os.environ.keys() if v.startswith('TRAVIS')))" > /tmp/env_file
 script:
-  - DOCKER_CMD="docker run --rm --env-file /tmp/env_file -e GH_TOKEN -v $PWD:/git-restapi/ lmazuel/swagger-to-sdk"
-  - if [[ $MODE == 'python' ]]; then $DOCKER_CMD AutorestCI/azure-sdk-for-python --pr-repo-id Azure/azure-sdk-for-python -o dev -v; fi
-  - if [[ $MODE == 'node' ]]; then $DOCKER_CMD AutorestCI/azure-sdk-for-node --pr-repo-id Azure/azure-sdk-for-node -o master -v; fi
+  #- DOCKER_CMD="docker run --rm --env-file /tmp/env_file -e GH_TOKEN -v $PWD:/git-restapi/ lmazuel/swagger-to-sdk"
+  #- if [[ $MODE == 'python' ]]; then $DOCKER_CMD AutorestCI/azure-sdk-for-python --pr-repo-id Azure/azure-sdk-for-python -o dev -v; fi
+  #- if [[ $MODE == 'node' ]]; then $DOCKER_CMD AutorestCI/azure-sdk-for-node --pr-repo-id Azure/azure-sdk-for-node -o master -v; fi
   - if [[ $MODE == 'syntax' ]]; then npm test; fi
diff --git a/keyvault/2015-06-01/swagger/keyvault.json b/keyvault/2015-06-01/swagger/keyvault.json
@@ -1822,11 +1822,10 @@
         },
         "kty": {
           "type": "string",
-          "description": "Key type, usually RSA",
+          "description": "Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet, usually RSA",
           "enum": [ "EC", "RSA", "RSA-HSM", "oct" ],
           "x-ms-enum": {
             "name": "JsonWebKeyType",
-            "description": "Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet",
             "modelAsString": true
           }
         },
@@ -2482,11 +2481,10 @@
         "kty": {
           "type": "string",
           "minLength": 1,
-          "description": "The type of key to create. Valid key types, see JsonWebKeyType.",
+          "description": "The type of key to create. 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",
-            "description": "Supported JsonWebKey key types (kty) for Elliptic Curve, RSA, HSM, Octet",
             "modelAsString": true
           }
         },
@@ -2503,7 +2501,6 @@
             "enum": [ "encrypt", "decrypt", "sign", "verify", "wrapKey", "unwrapKey" ],
             "x-ms-enum": {
               "name": "JsonWebKeyOperation",
-              "description": "Supported JsonWebKey operations.",
               "modelAsString": true
             }
           }
@@ -2559,7 +2556,6 @@
           "enum": [ "RSA-OAEP", "RSA1_5" ],
           "x-ms-enum": {
             "name": "JsonWebKeyEncryptionAlgorithm",
-            "description": "Supported JsonWebKey algorithms.",
             "modelAsString": true
           }
         },
@@ -2581,7 +2577,6 @@
           "enum": [ "RS256", "RS384", "RS512", "RSNULL" ],
           "x-ms-enum": {
             "name": "JsonWebKeySignatureAlgorithm",
-            "description": "Supported JsonWebKey algorithms.",
             "modelAsString": true
           }
         },
@@ -2603,7 +2598,6 @@
           "enum": [ "RS256", "RS384", "RS512", "RSNULL" ],
           "x-ms-enum": {
             "name": "JsonWebKeySignatureAlgorithm",
-            "description": "Supported JsonWebKey algorithms.",
             "modelAsString": true
           }
         },
@@ -2631,7 +2625,6 @@
             "enum": [ "encrypt", "decrypt", "sign", "verify", "wrapKey", "unwrapKey" ],
             "x-ms-enum": {
               "name": "JsonWebKeyOperation",
-              "description": "Supported JsonWebKey operations.",
               "modelAsString": true
             }
           },